aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAreli, Fuss (af732p) <af732p@att.com>2018-05-01 12:11:06 +0300
committerMichael Lando <ml636r@att.com>2018-05-01 13:13:29 +0000
commit332a0bd8fdb00136efddfb311b9ac1e256d82027 (patch)
treebde721591c5c61592e96c9bf3cf905765a88de70
parentd1bfb427915c303e40a43195e9219b9c3a566ecc (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>
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb5
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb3
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb11
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/attributes/default.rb5
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb3
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb8
-rw-r--r--catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-plugins-configuration.yaml.erb2
-rw-r--r--sdc-os-chef/environments/Template.json2
8 files changed, 26 insertions, 13 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:
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"
diff --git a/sdc-os-chef/environments/Template.json b/sdc-os-chef/environments/Template.json
index dae0860861..b6760cc62f 100644
--- a/sdc-os-chef/environments/Template.json
+++ b/sdc-os-chef/environments/Template.json
@@ -15,6 +15,8 @@
"FE_VIP": "yyy",
"ES_VIP": "yyy",
"KB_VIP": "yyy",
+ "DCAE_BE_VIP": "yyy",
+ "DCAE_FE_VIP": "yyy",
"interfaces": {
"application": "eth0",
"private": "eth1"