From 13c7907b9795549d4199accc574d65ffdd630a71 Mon Sep 17 00:00:00 2001 From: Dusan Rozman Date: Mon, 21 Aug 2017 14:11:40 -0400 Subject: Updated deployment yamls and config to SDC v1.1 Changed the yamls to pull the v1.1 image and updated config files for dockerdata Issue-ID: OOM-67 Change-Id: I2c51486a610f3187e200e5e08c59b132a5d7ffb5 Signed-off-by: Dusan Rozman --- .../config/docker/init/src/config/sdc/jetty/keystore | Bin 3697 -> 1416 bytes .../src/config/sdc/sdc-fe/FE_2_setup_configuration.rb | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'kubernetes/config') diff --git a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore b/kubernetes/config/docker/init/src/config/sdc/jetty/keystore index d6592f95ee..08f6cda8a7 100755 Binary files a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore and b/kubernetes/config/docker/init/src/config/sdc/jetty/keystore differ diff --git a/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb b/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb index 89f94fbf1e..9fc662ee0a 100755 --- a/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb +++ b/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb @@ -1,5 +1,6 @@ +jetty_base="/var/lib/jetty" template "catalog-fe-config" do - path "/var/lib/jetty/config/catalog-fe/configuration.yaml" + path "#{jetty_base}/config/catalog-fe/configuration.yaml" source "FE-configuration.yaml.erb" owner "jetty" group "jetty" @@ -11,3 +12,16 @@ template "catalog-fe-config" do :ssl_port => node['BE'][:https_port] }) end + +template "onboarding-fe-config" do + path "#{jetty_base}/config/onboarding-fe/onboarding_configuration.yaml" + source "FE-onboarding-configuration.yaml.erb" + owner "jetty" + group "jetty" + mode "0755" + variables({ + :catalog_ip => node['HOST_IP'], + :catalog_port => node['BE'][:http_port], + :ssl_port => node['BE'][:https_port] +}) +end -- cgit 1.2.3-korg