diff options
Diffstat (limited to 'sdc-os-chef/sdc-backend')
5 files changed, 39 insertions, 5 deletions
diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/keystore b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/keystore Binary files differnew file mode 100644 index 0000000000..08f6cda8a7 --- /dev/null +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/keystore diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb index 35147a30fb..70e4bd06fb 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_1_cleanup_jettydir.rb @@ -47,3 +47,11 @@ directory "BE_create_catalog-be" do action :create end + +directory "BE_create_catalog-be" do + path "/var/lib/jetty/config/onboarding-be" + owner 'jetty' + group 'jetty' + mode '0755' + action :create +end
\ No newline at end of file diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb index c8b8615140..2dd430ce7a 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_4_setup_configuration.rb @@ -1,7 +1,8 @@ +jetty_base="/var/lib/jetty" replication_factor=1 template "titan.properties" do - path "/var/lib/jetty/config/catalog-be/titan.properties" + path "/#{jetty_base}/config/catalog-be/titan.properties" source "BE-titan.properties.erb" owner "jetty" group "jetty" @@ -17,7 +18,7 @@ end template "catalog-be-config" do - path "/var/lib/jetty/config/catalog-be/configuration.yaml" + path "/#{jetty_base}/config/catalog-be/configuration.yaml" source "BE-configuration.yaml.erb" owner "jetty" group "jetty" @@ -35,7 +36,7 @@ end template "distribution-engine-configuration" do - path "/var/lib/jetty/config/catalog-be/distribution-engine-configuration.yaml" + path "/#{jetty_base}/config/catalog-be/distribution-engine-configuration.yaml" source "BE-distribution-engine-configuration.yaml.erb" owner "jetty" group "jetty" @@ -44,7 +45,7 @@ end cookbook_file "ArtifactGenerator" do - path "/var/lib/jetty/config/catalog-be/Artifact-Generator.properties" + path "/#{jetty_base}/config/catalog-be/Artifact-Generator.properties" source "Artifact-Generator.properties" owner "jetty" group "jetty" @@ -52,3 +53,23 @@ cookbook_file "ArtifactGenerator" do end +template "onboarding-be-config" do + path "/#{jetty_base}/config/onboarding-be/onboarding_configuration.yaml" + source "BE-onboarding-configuration.yaml.erb" + owner "m98835" + group "mechid" + mode "0755" + variables({ + :catalog_ip => node['HOST_IP'], + :catalog_port => node['BE'][:http_port], + :ssl_port => node['BE'][:https_port] +}) +end + + +cookbook_file "/#{jetty_base}/etc/keystore" do + source "keystore" + owner "jetty" + group "jetty" + mode 0755 +end diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-onboarding-configuration.yaml.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-onboarding-configuration.yaml.erb new file mode 100644 index 0000000000..4646661dfb --- /dev/null +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-onboarding-configuration.yaml.erb @@ -0,0 +1,5 @@ +notifications: + pollingIntervalMsec: 2000 + selectionSize: 100 + beHost: <%= @catalog_ip %> + beHttpPort: <%= @catalog_port %>
\ No newline at end of file diff --git a/sdc-os-chef/sdc-backend/startup.sh b/sdc-os-chef/sdc-backend/startup.sh index 5d88aa68ec..98699d9486 100644 --- a/sdc-os-chef/sdc-backend/startup.sh +++ b/sdc-os-chef/sdc-backend/startup.sh @@ -6,7 +6,7 @@ cd /root/chef-solo echo "normal['HOST_IP'] = \"${HOST_IP}\"" > /root/chef-solo/cookbooks/sdc-catalog-be/attributes/default.rb chef-solo -c solo.rb -E ${CHEFNAME} -sed -i '/^set -e/aJAVA_OPTIONS=\" -XX:MaxPermSize=256m -Xmx1500m -Dconfig.home=${JETTY_BASE}\/config -Dlog.home=${JETTY_BASE}\/logs -Dlogback.configurationFile=${JETTY_BASE}\/config\/catalog-be\/logback.xml -Dconfiguration.yaml=${JETTY_BASE}\/config\/catalog-be\/configuration.yaml -Dartifactgenerator.config=${JETTY_BASE}\/config\/catalog-be\/Artifact-Generator.properties\" ' /docker-entrypoint.sh +sed -i '/^set -e/aJAVA_OPTIONS=\" -XX:MaxPermSize=256m -Xmx1500m -Dconfig.home=${JETTY_BASE}\/config -Dlog.home=${JETTY_BASE}\/logs -Dlogback.configurationFile=${JETTY_BASE}\/config\/catalog-be\/logback.xml -Dconfiguration.yaml=${JETTY_BASE}\/config\/catalog-be\/configuration.yaml -Dartifactgenerator.config=${JETTY_BASE}\/config\/catalog-be\/Artifact-Generator.properties\ -Donboarding_configuration.yaml=${JETTY_BASE}\/config\/onboarding-be\/onboarding_configuration.yaml" ' /docker-entrypoint.sh sed -i '/^set -e/aTMPDIR=${JETTY_BASE}\/temp' /docker-entrypoint.sh # executiong the jetty |