From ff5371d53fa218a7a895061eec0501cc448b609e Mon Sep 17 00:00:00 2001 From: Eric Promislow Date: Fri, 19 Feb 2016 15:51:33 -0800 Subject: [PATCH] HCF-516: Make the name of the CCNG hostname configurable This allows HCF to not depend on consul to do DNS resolution. Also it's the only hardwired hostname in cf. --- bosh-templates/cloud_controller_api.yml.erb | 2 +- bosh-templates/cloud_controller_clock.yml.erb | 2 +- bosh-templates/cloud_controller_worker.yml.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bosh-templates/cloud_controller_api.yml.erb b/bosh-templates/cloud_controller_api.yml.erb index 7a1c574f1ab..e21e7fc42c0 100644 --- a/bosh-templates/cloud_controller_api.yml.erb +++ b/bosh-templates/cloud_controller_api.yml.erb @@ -21,7 +21,7 @@ #Actually NGX host and port local_route: <%= discover_external_ip %> external_port: <%= p("cc.external_port") %> -internal_service_hostname: cloud-controller-ng.service.cf.internal +internal_service_hostname: <%= p("cc.internal_service_hostname") %> pid_filename: /var/vcap/sys/run/cloud_controller_ng/cloud_controller_ng.pid newrelic_enabled: <%= !!properties.cc.newrelic.license_key || p("cc.development_mode") %> diff --git a/bosh-templates/cloud_controller_clock.yml.erb b/bosh-templates/cloud_controller_clock.yml.erb index 757c20fb47b..93a8d69e07e 100644 --- a/bosh-templates/cloud_controller_clock.yml.erb +++ b/bosh-templates/cloud_controller_clock.yml.erb @@ -21,7 +21,7 @@ #Actually NGX host and port local_route: <%= discover_external_ip %> external_port: <%= p("cc.external_port") %> -internal_service_hostname: cloud-controller-ng.service.cf.internal +internal_service_hostname: <%= p("cc.internal_service_hostname") %> pid_filename: /var/vcap/sys/run/cloud_controller_clock/cloud_controller_ng.pid newrelic_enabled: false diff --git a/bosh-templates/cloud_controller_worker.yml.erb b/bosh-templates/cloud_controller_worker.yml.erb index 1a0a56dd1e6..cc80974e1fb 100644 --- a/bosh-templates/cloud_controller_worker.yml.erb +++ b/bosh-templates/cloud_controller_worker.yml.erb @@ -21,7 +21,7 @@ #Actually NGX host and port local_route: <%= discover_external_ip %> external_port: <%= p("cc.external_port") %> -internal_service_hostname: cloud-controller-ng.service.cf.internal +internal_service_hostname: <%= p("cc.internal_service_hostname") %> pid_filename: /this/isnt/used/by/the/worker newrelic_enabled: <%= !!properties.cc.newrelic.license_key %>