diff options
| author |   Idan Amit <ia096e@intl.att.com> | 2017-12-29 09:40:43 +0200 |
|---|---|---|
| committer |   Michael Lando <ml636r@att.com> | 2017-12-31 08:51:03 +0000 |
| commit | 2c285722c35d8ee7fd6c9085c8e60f0fa87d5761 (patch) | |
| tree | b99164f8030c843091088a68a5638f9d9d1d80dc /sdc-os-chef/sdc-frontend | |
| parent | 0195e726cae3f5267dd3be69e089bbbeb4ad5f09 (diff) | |
SDC Designers Integration - Part 1
Finished first part of designers integration
Added templated configuration file
Added tests
Change-Id: I76e8b413063b939e1eb58da4a5502c4b526168f2
Issue-ID: SDC-687
Signed-off-by: Idan Amit <ia096e@intl.att.com>
Diffstat (limited to 'sdc-os-chef/sdc-frontend')
3 files changed, 32 insertions, 1 deletions
diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb index 006eed8831..7dcf260d31 100644 --- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb @@ -16,6 +16,24 @@ template "catalog-fe-config" do }) end +template "designers-fe-config" do + path "#{jetty_base}/config/catalog-fe/designers-configuration.yaml" + source "FE-designers-configuration.yaml.erb" + owner "jetty" + group "jetty" + mode "0755" + variables({ + :dcae_host => node['Designers']['DCAE']['dcae_host'], + :dcae_port => node['Designers']['DCAE']['dcae_port'], + :dcae_path => node['Designers']['DCAE']['dcae_path'], + :dcae_protocol => node['Designers']['DCAE']['dcae_protocol'], + :workflow_host => node['Designers']['WORKFLOW']['workflow_host'], + :workflow_port => node['Designers']['WORKFLOW']['workflow_port'], + :workflow_path => node['Designers']['WORKFLOW']['workflow_path'], + :workflow_protocol => node['Designers']['WORKFLOW']['workflow_protocol'] + }) +end + template "onboarding-fe-config" do path "#{jetty_base}/config/onboarding-fe/onboarding_configuration.yaml" diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb new file mode 100644 index 0000000000..b5092728ba --- /dev/null +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-designers-configuration.yaml.erb @@ -0,0 +1,13 @@ +designersList: + DCAE: + displayName: DCAE + designerHost: <%= @dcae_host %> + designerPort: <%= @dcae_port %> + designerPath: <%= @dcae_path %> + designerProtocol: <%= @dcae_protocol %> + WORKFLOW: + displayName: WORKFLOW + designerHost: <%= @workflow_host %> + designerPort: <%= @workflow_port %> + designerPath: <%= @workflow_path %> + designerProtocol: <%= @workflow_protocol %>
\ No newline at end of file diff --git a/sdc-os-chef/sdc-frontend/startup.sh b/sdc-os-chef/sdc-frontend/startup.sh index 4b000c984f..82aef0b352 100644 --- a/sdc-os-chef/sdc-frontend/startup.sh +++ b/sdc-os-chef/sdc-frontend/startup.sh @@ -5,7 +5,7 @@ cd /root/chef-solo echo "normal['HOST_IP'] = \"${HOST_IP}\"" > /root/chef-solo/cookbooks/sdc-catalog-fe/attributes/default.rb chef-solo -c solo.rb -E ${CHEFNAME} -sed -i '/^set -e/aJAVA_OPTIONS=\"-XX:MaxPermSize=256m -Xmx512m -Dconfig.home=${JETTY_BASE}\/config -Dlog.home=${JETTY_BASE}\/logs -Dlogback.configurationFile=${JETTY_BASE}\/config\/catalog-fe\/logback.xml -Dconfiguration.yaml=${JETTY_BASE}\/config\/catalog-fe\/configuration.yaml -Donboarding_configuration.yaml=${JETTY_BASE}\/config\/onboarding-fe\/onboarding_configuration.yaml\"' /docker-entrypoint.sh +sed -i '/^set -e/aJAVA_OPTIONS=\" -Xdebug -agentlib:jdwp=transport=dt_socket,address=6000,server=y,suspend=n -XX:MaxPermSize=256m -Xmx512m -Dconfig.home=${JETTY_BASE}\/config -Dlog.home=${JETTY_BASE}\/logs -Dlogback.configurationFile=${JETTY_BASE}\/config\/catalog-fe\/logback.xml -Dconfiguration.yaml=${JETTY_BASE}\/config\/catalog-fe\/configuration.yaml -Donboarding_configuration.yaml=${JETTY_BASE}\/config\/onboarding-fe\/onboarding_configuration.yaml\"' /docker-entrypoint.sh sed -i '/^set -e/aTMPDIR=${JETTY_BASE}\/temp' /docker-entrypoint.sh cd /var/lib/jetty |