Use cf.internal as domain

[#99062314]

Signed-off-by: Michael Fraenkel <[email protected]>

Author: andrew-edgar

bosh-templates/cloud_controller_api.yml.erb

@@ -2,7 +2,7 @@
 #Actually NGX host and port
 local_route: <%= spec.networks.send(properties.networks.apps).ip %>
 external_port: <%= p("cc.external_port") %>
-internal_service_hostname: cloud-controller-ng.service.consul
+internal_service_hostname: cloud-controller-ng.service.cf.internal
 
 pid_filename: /var/vcap/sys/run/cloud_controller_ng/cloud_controller_ng.pid
 newrelic_enabled: <%= !!properties.cc.newrelic.license_key || p("cc.development_mode") %>
@@ -264,9 +264,9 @@ cloud_controller_username_lookup_client_name: "cloud_controller_username_lookup"
 cloud_controller_username_lookup_client_secret: <%= p("uaa.clients.cloud_controller_username_lookup.secret") %>
 
 users_can_select_backend: <%= p("cc.users_can_select_backend") %>
-diego_nsync_url: http://nsync.service.consul:8787
-diego_stager_url: http://stager.service.consul:8888
-diego_tps_url: http://tps.service.consul:1518
+diego_nsync_url: http://nsync.service.cf.internal:8787
+diego_stager_url: http://stager.service.cf.internal:8888
+diego_tps_url: http://tps.service.cf.internal:1518
 allow_app_ssh_access: <%= p("cc.allow_app_ssh_access") %>
 default_to_diego_backend: <%= p("cc.default_to_diego_backend") %>
 

bosh-templates/cloud_controller_clock.yml.erb

@@ -2,7 +2,7 @@
 #Actually NGX host and port
 local_route: <%= spec.networks.send(properties.networks.apps).ip %>
 external_port: <%= p("cc.external_port") %>
-internal_service_hostname: cloud-controller-ng.service.consul
+internal_service_hostname: cloud-controller-ng.service.cf.internal
 
 pid_filename: /var/vcap/sys/run/cloud_controller_clock/cloud_controller_ng.pid
 newrelic_enabled: false
@@ -239,9 +239,9 @@ uaa_client_scope: <%= p("uaa.clients.cc-service-dashboards.scope") %>
 <% end %>
 
 users_can_select_backend: <%= p("cc.users_can_select_backend") %>
-diego_nsync_url: http://nsync.service.consul:8787
-diego_stager_url: http://stager.service.consul:8888
-diego_tps_url: http://tps.service.consul:1518
+diego_nsync_url: http://nsync.service.cf.internal:8787
+diego_stager_url: http://stager.service.cf.internal:8888
+diego_tps_url: http://tps.service.cf.internal:1518
 allow_app_ssh_access: <%= p("cc.allow_app_ssh_access") %>
 default_to_diego_backend: <%= p("cc.default_to_diego_backend") %>
 

bosh-templates/cloud_controller_worker.yml.erb

@@ -2,7 +2,7 @@
 #Actually NGX host and port
 local_route: <%= spec.networks.send(properties.networks.apps).ip %>
 external_port: <%= p("cc.external_port") %>
-internal_service_hostname: cloud-controller-ng.service.consul
+internal_service_hostname: cloud-controller-ng.service.cf.internal
 
 pid_filename: /this/isnt/used/by/the/worker
 newrelic_enabled: <%= !!properties.cc.newrelic.license_key %>
@@ -237,9 +237,9 @@ uaa_client_scope: <%= p("uaa.clients.cc-service-dashboards.scope") %>
 <% end %>
 
 users_can_select_backend: <%= p("cc.users_can_select_backend") %>
-diego_nsync_url: http://nsync.service.consul:8787
-diego_stager_url: http://stager.service.consul:8888
-diego_tps_url: http://tps.service.consul:1518
+diego_nsync_url: http://nsync.service.cf.internal:8787
+diego_stager_url: http://stager.service.cf.internal:8888
+diego_tps_url: http://tps.service.cf.internal:1518
 allow_app_ssh_access: <%= p("cc.allow_app_ssh_access") %>
 default_to_diego_backend: <%= p("cc.default_to_diego_backend") %>
 

config/cloud_controller.yml

@@ -154,9 +154,9 @@ cloud_controller_username_lookup_client_secret: 'username_lookup_secret'
 
 users_can_select_backend: true
 allow_app_ssh_access: true
-diego_nsync_url: http://nsync.service.consul:8787
-diego_stager_url: http://stager.service.consul:8888
-diego_tps_url: http://tps.service.consul:1518
+diego_nsync_url: http://nsync.service.cf.internal:8787
+diego_stager_url: http://stager.service.cf.internal:8888
+diego_tps_url: http://tps.service.cf.internal:1518
 
 renderer:
   max_results_per_page: 100

spec/fixtures/config/default_overriding_config.yml

@@ -56,7 +56,7 @@ bulk_api:
   auth_user: bulk_user
   auth_password: bulk_password
 
-internal_service_hostname: cloud_controller_ng.service.consul
+internal_service_hostname: cloud_controller_ng.service.cf.internal
 internal_api:
   auth_user: internal_user
   auth_password: internal_password

spec/unit/lib/cloud_controller/config_spec.rb

@@ -169,7 +169,7 @@ module VCAP::CloudController
           end
 
           it 'preserves the internal_service_hostname value from the file' do
-            expect(config[:internal_service_hostname]).to eq('cloud_controller_ng.service.consul')
+            expect(config[:internal_service_hostname]).to eq('cloud_controller_ng.service.cf.internal')
           end
 
           context 'when the staging auth is already url encoded' do