diff options
Diffstat (limited to 'docker/docker_be/chef-solo/cookbooks')
3 files changed, 20 insertions, 10 deletions
diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb index 9d37ab7..19d401e 100644 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb +++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/attributes/default.rb @@ -5,15 +5,19 @@ default['APP_LOG_DIR'] = "/opt/logs/be" default['DCAE']['consumerName'] = "dcaeDesigner" default['DCAE']['consumerPass'] = "Aa123456" -default['DCAE']['BE'][:http_port] = 8082 -default['DCAE']['BE'][:https_port] = 8444 +default['DCAE']['BE']['http_port'] = 8082 +default['DCAE']['BE']['https_port'] = 8444 +default['DCAE']['TOSCA_LAB']['http_port'] = 8085 -default['SDC']['BE'][:http_port] = 8080 -default['SDC']['BE'][:https_port] = 8443 +default['SDC']['BE']['http_port'] = 8080 +default['SDC']['BE']['https_port'] = 8443 +default['DCAE']['TOSCA_LAB']['https_port'] = 8085 -default['jetty'][:keystore_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" -default['jetty'][:keymanager_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" -default['jetty'][:truststore_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" +default['jetty']['keystore_pwd'] = "OBF:1cp61iuj194s194u194w194y1is31cok" +default['jetty']['keymanager_pwd'] = "OBF:1cp61iuj194s194u194w194y1is31cok" +default['jetty']['truststore_pwd'] = "OBF:1cp61iuj194s194u194w194y1is31cok" default['disableHttp'] = true +default['DCAE_TOSCA_LAB_VIP'] = "localhost" + diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/dcae_setup.rb b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/dcae_setup.rb index 645cfa3..dc9dfda 100644 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/dcae_setup.rb +++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/recipes/dcae_setup.rb @@ -2,15 +2,19 @@ jetty_base = "#{node['JETTY_BASE']}" dcae_logs = "#{node['APP_LOG_DIR']}" sdc_be_vip = node['BE_VIP'] +dcae_tosca_lab_vip = node['DCAE_TOSCA_LAB_VIP'] + if node['disableHttp'] protocol = "https" - sdc_be_port = node['SDC']['BE'][:https_port] - dcae_be_port = node['DCAE']['BE'][:https_port] + sdc_be_port = node['SDC']['BE']['https_port'] + dcae_be_port = node['DCAE']['BE']['https_port'] + dcae_tosca_lab_port = node['DCAE']['TOSCA_LAB']['https_port'] else protocol = "http" sdc_be_port = node['SDC']['BE'][:http_port] dcae_be_port = node['DCAE']['BE'][:http_port] + dcae_tosca_lab_port = node['DCAE']['TOSCA_LAB']['http_port'] end printf("DEBUG: [%s]:[%s] disableHttp=[%s], protocol=[%s], sdc_be_vip=[%s], sdc_be_port=[%s] !!! \n", cookbook_name, recipe_name, node['disableHttp'], protocol, sdc_be_vip ,sdc_be_port ) @@ -54,6 +58,8 @@ template "dcae-be-config" do :sdc_be_vip => sdc_be_vip, :sdc_be_port => sdc_be_port, :protocol => protocol, + :dcae_tosca_lab_vip => dcae_tosca_lab_vip, + :dcae_tosca_lab_port => dcae_tosca_lab_port }) end diff --git a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/dcae-application.properties.erb b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/dcae-application.properties.erb index a2a3201..ecfa0bc 100644 --- a/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/dcae-application.properties.erb +++ b/docker/docker_be/chef-solo/cookbooks/Deploy-DCAE/templates/default/dcae-application.properties.erb @@ -5,7 +5,7 @@ server.contextPath=/ scheduled.timer.value=5000 asdc_catalog_url=asdc uri=<%= @protocol %>://<%= @consumerAuth %>@<%= @sdc_be_vip %>:<%= @sdc_be_port %>#demo -toscalab.url=http://localhost:8085 +toscalab.url=http://<%= @dcae_tosca_lab_vip %>:<%= @dcae_tosca_lab_port %> blueprinter.uri=${toscalab.url}/translate blueprinter.hcuri=${toscalab.url}/healthcheck blueprinter.hcretrynum=3 |