From 425040c807f03eaae14b3c02708533f4f546d9c6 Mon Sep 17 00:00:00 2001 From: ChrisC Date: Tue, 16 Mar 2021 14:12:46 +0100 Subject: Remove unused dcae-be healthcheck Remove DCAE-DS backend Healthchecks that are noisy in the logs DCAE-DS was sunset in G release Issue-ID: SDC-3514 Signed-off-by: ChrisC Change-Id: Iad9d6738ec813be9b87766ed189deda34e711ab1 --- .../chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb | 5 ----- .../sdc-catalog-be/recipes/BE_2_setup_configuration.rb | 1 - .../templates/default/BE-configuration.yaml.erb | 11 ----------- 3 files changed, 17 deletions(-) (limited to 'catalog-be/src/main/docker/backend') diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb index 614433c2e7..528ddae9ad 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb +++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb @@ -19,11 +19,6 @@ default['jetty'][:keymanager_pwd] = "?(kP!Yur![*!Y5!E^f(ZKc31" # MUST BE ALSO CHANGE IN THE startup.sh FILE default['jetty'][:truststore_pwd] = "z+KEj;t+,KN^iimSiS89e#p0" -#Reserved for DCAE backend -default['DCAE']['BE'][:http_port] = 8082 -default['DCAE']['BE'][:https_port] = 8444 -default['DCAE_BE_VIP'] = "dcae-be" - #BasicAuth default['basic_auth']['enabled'] = false default['basic_auth'][:user_name] = "testName" diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb index cdb9f82729..51a943fa68 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb +++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb @@ -61,7 +61,6 @@ template "catalog-be-config" do :cassandra_usr => node['cassandra'][:cassandra_user], :cassandra_truststore_password => node['cassandra'][:truststore_password], :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}", - :dcae_be_vip => node['DCAE_BE_VIP'], :dmaap_active => node['DMAAP']['active'] }) end diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index e8d2ece84b..5a059aae7d 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -948,17 +948,6 @@ onboarding: downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages" healthCheckUri: "/onboarding-api/v1.0/healthcheck" -dcae: - host: <%= @dcae_be_vip %> - <% if node[:disableHttp] -%> - protocol: https - port: <%= node['DCAE']['BE'][:https_port] %> - <% else %> - protocol: http - port: <%= node['DCAE']['BE'][:http_port] %> - <% end -%> - healthCheckUri: "/dcae/healthCheck" - # #GSS IDNS switchoverDetector: gBeFqdn: -- cgit 1.2.3-korg