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-fe/sdc-frontend/chef-repo/cookbooks | |
| 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-fe/sdc-frontend/chef-repo/cookbooks')
4 files changed, 12 insertions, 6 deletions
diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb index 272a1166ab..fb4166b15e 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb @@ -7,3 +7,8 @@ default['disableHttp'] = true default['jetty'][:keystore_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" default['jetty'][:keymanager_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" default['jetty'][:truststore_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" + +#Reserved for DCAE backend +default['DCAE']['FE'][:http_port] = 8183 +default['DCAE']['FE'][:https_port] = 9444 +default['DCAE_FE_VIP'] = "dcaed-fe"
\ No newline at end of file diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb index 2f747c308d..0cb0972dbc 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb @@ -9,7 +9,8 @@ template "catalog-fe-config" do :be_host_ip => node['Nodes']['BE'], :kb_host_ip => node['Nodes']['KB'], :catalog_port => node['BE'][:http_port], - :ssl_port => node['BE'][:https_port] + :ssl_port => node['BE'][:https_port], + :dcae_fe_vip => node['DCAE_FE_VIP'] }) end diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb index b4368709c4..d14a73a526 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb @@ -51,15 +51,15 @@ onboarding: <% end -%> dcae: - host: <%= @fe_host_ip %> + host: <%= @dcae_fe_vip %> <% if node[:disableHttp] -%> protocol: https - port: <%= node['FE'][:https_port] %> + port: <%= node['DCAE']['FE'][:https_port] %> <% else %> protocol: http - port: <%= node['FE'][:http_port] %> + port: <%= node['DCAE']['FE'][:http_port] %> <% end -%> - healthCheckUri: "/dcae/healthCheck" + healthCheckUri: "/dcaed/healthCheck" identificationHeaderFields: - diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb index 0da79733bd..994241d326 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb @@ -2,7 +2,7 @@ pluginsList: - pluginId: DCAE pluginDiscoveryUrl: <%= @dcae_discovery_url %> pluginSourceUrl: <%= @dcae_source_url %> - pluginStateUrl: "dcae" + pluginStateUrl: "dcaed" pluginDisplayOptions: context: displayName: "Monitoring" |