summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Cassiba <s@cassiba.com>2018-07-16 12:38:24 -0700
committerSamuel Cassiba <s@cassiba.com>2018-07-16 12:38:42 -0700
commit79b76424f320f0b750557ca8f03ae34479038ff1 (patch)
treed3bcc4648aa215a8eb31aa33722a7a0a95e86888
parent4992010231b205140b5fa1b3279d75d76e89acf7 (diff)
Use internal identity endpoint for services
Notes
Notes (review): Code-Review+2: Jan Klare <j.klare@cloudbau.de> Workflow+1: Christoph Albers <c.albers@x-ion.de> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 18 Jul 2018 16:54:05 +0000 Reviewed-on: https://review.openstack.org/583033 Project: openstack/cookbook-openstack-compute Branch: refs/heads/master
-rw-r--r--recipes/identity_registration.rb4
-rw-r--r--recipes/nova-common.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb
index 0d90237..2ee9e3a 100644
--- a/recipes/identity_registration.rb
+++ b/recipes/identity_registration.rb
@@ -25,7 +25,7 @@ class ::Chef::Recipe
25 include ::Openstack 25 include ::Openstack
26end 26end
27 27
28identity_endpoint = public_endpoint 'identity' 28identity_endpoint = internal_endpoint 'identity'
29interfaces = { 29interfaces = {
30 public: { url: public_endpoint('compute-api') }, 30 public: { url: public_endpoint('compute-api') },
31 internal: { url: internal_endpoint('compute-api') }, 31 internal: { url: internal_endpoint('compute-api') },
@@ -35,7 +35,7 @@ placement_interfaces = {
35 public: { url: public_endpoint('placement-api') }, 35 public: { url: public_endpoint('placement-api') },
36 internal: { url: internal_endpoint('placement-api') }, 36 internal: { url: internal_endpoint('placement-api') },
37} 37}
38auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version'] 38auth_url = ::URI.decode identity_endpoint.to_s
39service_pass = get_password 'service', 'openstack-compute' 39service_pass = get_password 'service', 'openstack-compute'
40service_user = node['openstack']['compute']['conf']['keystone_authtoken']['username'] 40service_user = node['openstack']['compute']['conf']['keystone_authtoken']['username']
41placement_service_pass = get_password 'service', 'openstack-placement' 41placement_service_pass = get_password 'service', 'openstack-placement'
diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb
index a10708e..fc134e4 100644
--- a/recipes/nova-common.rb
+++ b/recipes/nova-common.rb
@@ -104,7 +104,7 @@ memcache_servers = memcached_servers.join ','
104# Note that the bind and vnc endpoints don't have possible different values for 104# Note that the bind and vnc endpoints don't have possible different values for
105# internal/admin/public. We'll stick with the general endpoint routine 105# internal/admin/public. We'll stick with the general endpoint routine
106# for those. 106# for those.
107identity_endpoint = public_endpoint 'identity' 107identity_endpoint = internal_endpoint 'identity'
108xvpvnc_endpoint = public_endpoint 'compute-xvpvnc' 108xvpvnc_endpoint = public_endpoint 'compute-xvpvnc'
109xvpvnc_bind = node['openstack']['bind_service']['all']['compute-xvpvnc'] 109xvpvnc_bind = node['openstack']['bind_service']['all']['compute-xvpvnc']
110xvpvnc_bind_address = bind_address xvpvnc_bind 110xvpvnc_bind_address = bind_address xvpvnc_bind
@@ -142,7 +142,7 @@ node.default['openstack']['compute']['conf_secrets']
142.[]('neutron')['metadata_proxy_shared_secret'] = 142.[]('neutron')['metadata_proxy_shared_secret'] =
143 get_password 'token', 'neutron_metadata_secret' 143 get_password 'token', 'neutron_metadata_secret'
144 144
145auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version'] 145auth_url = ::URI.decode identity_endpoint.to_s
146node.default['openstack']['compute']['conf_secrets'] 146node.default['openstack']['compute']['conf_secrets']
147 .[]('keystone_authtoken')['password'] = 147 .[]('keystone_authtoken')['password'] =
148 get_password 'service', 'openstack-compute' 148 get_password 'service', 'openstack-compute'