aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb17
-rw-r--r--catalog-fe/src/main/resources/config/plugins-configuration.yaml23
-rw-r--r--sdc-os-chef/environments/Template.json16
-rw-r--r--sdc-os-chef/environments/plugins-configuration.yaml (renamed from catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb)2
-rwxr-xr-xsdc-os-chef/scripts/docker_run.sh2
5 files changed, 3 insertions, 57 deletions
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
index 094317f014..9df2ac97b9 100644
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
+++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
@@ -14,23 +14,6 @@ template "catalog-fe-config" do
})
end
-template "plugins-fe-config" do
- path "#{ENV['JETTY_BASE']}/config/catalog-fe/plugins-configuration.yaml"
- source "FE-plugins-configuration.yaml.erb"
- owner "jetty"
- group "jetty"
- mode "0755"
- variables({
- :dcae_discovery_url => node['Plugins']['DCAE']['dcae_discovery_url'],
- :dcae_source_url => node['Plugins']['DCAE']['dcae_source_url'],
- :dcae_dt_discovery_url => node['Plugins']['DCAE-TAB']['dcae_dt_discovery_url'],
- :dcae_dt_source_url => node['Plugins']['DCAE-TAB']['dcae_dt_source_url'],
- :workflow_discovery_url => node['Plugins']['WORKFLOW']['workflow_discovery_url'],
- :workflow_source_url => node['Plugins']['WORKFLOW']['workflow_source_url']
- })
-end
-
-
template "onboarding-fe-config" do
path "#{ENV['JETTY_BASE']}/config/onboarding-fe/onboarding_configuration.yaml"
source "FE-onboarding-configuration.yaml.erb"
diff --git a/catalog-fe/src/main/resources/config/plugins-configuration.yaml b/catalog-fe/src/main/resources/config/plugins-configuration.yaml
deleted file mode 100644
index eb36945715..0000000000
--- a/catalog-fe/src/main/resources/config/plugins-configuration.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-pluginsList:
- - pluginId: DCAE
- pluginDiscoveryUrl: http://localhost:8702/dcae
- pluginSourceUrl: http://localhost:8702/dcae
- pluginStateUrl: "dcae"
- pluginDisplayOptions:
- context:
- displayName: "Monitor"
- displayContext: ["VF", "SERVICE"]
- displayRoles: ["DESIGNER"]
- - pluginId: WORKFLOW
- pluginDiscoveryUrl: http://localhost:9527/
- pluginSourceUrl: http://localhost:9527/
- pluginStateUrl: "workflowDesigner"
- pluginDisplayOptions:
- top:
- displayName: "WORKFLOW"
- context:
- displayName: "Workflow Designer"
- displayContext: ["VF", "SERVICE"]
- displayRoles: ["DESIGNER", "TESTER"]
-
-connectionTimeout: 1000 \ No newline at end of file
diff --git a/sdc-os-chef/environments/Template.json b/sdc-os-chef/environments/Template.json
index c998d8bcfb..57834c474c 100644
--- a/sdc-os-chef/environments/Template.json
+++ b/sdc-os-chef/environments/Template.json
@@ -43,21 +43,7 @@
],
"KB": "yyy"
},
- "Plugins": {
- "DCAE": {
- "dcae_discovery_url": "http://yyy:8183/dcaed/#/demo",
- "dcae_source_url": "http://yyy:8183/dcaed/#/demo"
- },
- "DCAE-TAB": {
- "dcae_dt_discovery_url": "yyy",
- "dcae_dt_source_url": "yyy"
- },
- "WORKFLOW": {
- "workflow_discovery_url": "yyy",
- "workflow_source_url": "yyy"
- }
- },
- "VnfRepo": {
+ "VnfRepo": {
"vnfRepoPort": "8702",
"vnfRepoHost": "10.0.14.1"
}
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb b/sdc-os-chef/environments/plugins-configuration.yaml
index 338432d896..21de74636f 100644
--- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb
+++ b/sdc-os-chef/environments/plugins-configuration.yaml
@@ -25,4 +25,4 @@ pluginsList:
displayName: "WORKFLOW"
displayRoles: ["DESIGNER", "TESTER"]
-connectionTimeout: 1000
+connectionTimeout: 1000 \ No newline at end of file
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index caee91e171..184c4f00a8 100755
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -444,7 +444,7 @@ function sdc-FE {
else
ADDITIONAL_ARGUMENTS=${FE_DEBUG_PORT}
fi
- docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env JAVA_OPTIONS="${FE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/FE/:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 9443:9443 --publish 8181:8181 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-frontend:${RELEASE}
+ docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env JAVA_OPTIONS="${FE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/FE/:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --volume ${WORKSPACE}/data/environments/plugins-configuration.yaml:${JETTY_BASE}/config/catalog-fe/plugins-configuration.yaml --publish 9443:9443 --publish 8181:8181 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-frontend:${RELEASE}
command_exit_status $? ${DOCKER_NAME}
echo "please wait while FE is starting....."
monitor_docker ${DOCKER_NAME}