From 51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Sun, 10 Dec 2017 18:55:03 +0200 Subject: Final commit to master merge from Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507 Issue-ID: SDC-714 Signed-off-by: Tal Gitelman --- .../cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb | 1 + .../sdc-catalog-fe/templates/default/FE-configuration.yaml.erb | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'sdc-os-chef/sdc-frontend/chef-repo/cookbooks') diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb index dc07166fdd..006eed8831 100644 --- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb @@ -10,6 +10,7 @@ template "catalog-fe-config" do variables({ :fe_host_ip => node['HOST_IP'], :be_host_ip => node['HOST_IP'], + :kb_host_ip => node['HOST_IP'], :catalog_port => node['BE'][:http_port], :ssl_port => node['BE'][:https_port] }) diff --git a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb index b730c509c7..23ed9ba156 100644 --- a/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb +++ b/sdc-os-chef/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/templates/default/FE-configuration.yaml.erb @@ -32,6 +32,12 @@ onboarding: port: 8181 healthCheckUri: "/onboarding/v1.0/healthcheck" +dcae: + protocol: http + host: localhost + port: 8181 + healthCheckUri: "/dcae/healthCheck" + identificationHeaderFields: - - &HTTP_IV_USER HTTP_IV_USER @@ -79,6 +85,6 @@ systemMonitoring: isProxy: true probeIntervalInSeconds: 15 -kibanaHost: localhost +kibanaHost: <%= @kb_host_ip %> kibanaPort: 5601 kibanaProtocol: http -- cgit 1.2.3-korg