diff options
| author |   Areli, Fuss (af732p) <af732p@att.com> | 2018-05-01 12:11:06 +0300 |
|---|---|---|
| committer |   Michael Lando <ml636r@att.com> | 2018-05-01 13:13:29 +0000 |
| commit | 332a0bd8fdb00136efddfb311b9ac1e256d82027 (patch) | |
| tree | bde721591c5c61592e96c9bf3cf905765a88de70 /catalog-be/sdc-backend | |
| parent | d1bfb427915c303e40a43195e9219b9c3a566ecc (diff) | |
Update DCAE BE and FE configuration
Update DCAE BE and FE configuration
Change-Id: I6214abfddc1e7916750553881f6a51775c102324
Issue-ID: SDC-1282
Signed-off-by: Areli, Fuss (af732p) <af732p@att.com>
Diffstat (limited to 'catalog-be/sdc-backend')
3 files changed, 12 insertions, 7 deletions
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb index 347ecf5f9e..624ec83385 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb @@ -8,3 +8,8 @@ default['cassandra'][:truststore_password] = "Aa123456" default['jetty'][:keystore_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" default['jetty'][:keymanager_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" default['jetty'][:truststore_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" + +#Reserved for DCAE backend +default['DCAE']['BE'][:http_port] = 8082 +default['DCAE']['BE'][:https_port] = 8444 +default['DCAE_BE_VIP'] = "dcaed-be"
\ No newline at end of file diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb index 2ba89801c4..8a44bc776c 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb @@ -47,7 +47,8 @@ template "catalog-be-config" do :cassandra_pwd => node['cassandra'][:cassandra_password], :cassandra_usr => node['cassandra'][:cassandra_user], :cassandra_truststore_password => node['cassandra'][:truststore_password], - :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}" + :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}", + :dcae_fe_vip => default['DCAE_FE_VIP'] }) end diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index 0d6d26d68b..4ee5c70f9d 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -565,17 +565,16 @@ onboarding: healthCheckUri: "/onboarding-api/v1.0/healthcheck" dcae: + host: <%= @dcae_be_vip %> <% if node[:disableHttp] -%> protocol: https - host: <%= @catalog_ip %> - port: <%= node['BE'][:https_port] %> + port: <%= node['DCAE']['BE'][:https_port] %> <% else %> protocol: http - host: <%= @catalog_ip %> - port: <%= node['BE'][:http_port] %> - <% end -%> + port: <%= node['DCAE']['BE'][:http_port] %> + <% end -%> - healthCheckUri: "/dcae/healthCheck" + healthCheckUri: "/dcaed/healthCheck" # #GSS IDNS switchoverDetector: |