Browse Source

Use internal identity endpoint for services

Depends-On: Id74966d9f1279f725bc41c08e434230a7845bbc1
Change-Id: Ibce1f2d4796e44941df4b7256de786e49a7386cc
Samuel Cassiba 9 months ago
parent
commit
79b76424f3
2 changed files with 4 additions and 4 deletions
  1. 2
    2
      recipes/identity_registration.rb
  2. 2
    2
      recipes/nova-common.rb

+ 2
- 2
recipes/identity_registration.rb View File

@@ -25,7 +25,7 @@ class ::Chef::Recipe
25 25
   include ::Openstack
26 26
 end
27 27
 
28
-identity_endpoint = public_endpoint 'identity'
28
+identity_endpoint = internal_endpoint 'identity'
29 29
 interfaces = {
30 30
   public: { url: public_endpoint('compute-api') },
31 31
   internal: { url: internal_endpoint('compute-api') },
@@ -35,7 +35,7 @@ placement_interfaces = {
35 35
   public: { url: public_endpoint('placement-api') },
36 36
   internal: { url: internal_endpoint('placement-api') },
37 37
 }
38
-auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
38
+auth_url = ::URI.decode identity_endpoint.to_s
39 39
 service_pass = get_password 'service', 'openstack-compute'
40 40
 service_user = node['openstack']['compute']['conf']['keystone_authtoken']['username']
41 41
 placement_service_pass = get_password 'service', 'openstack-placement'

+ 2
- 2
recipes/nova-common.rb View File

@@ -104,7 +104,7 @@ memcache_servers = memcached_servers.join ','
104 104
 # Note that the bind and vnc endpoints don't have possible different values for
105 105
 # internal/admin/public. We'll stick with the general endpoint routine
106 106
 # for those.
107
-identity_endpoint = public_endpoint 'identity'
107
+identity_endpoint = internal_endpoint 'identity'
108 108
 xvpvnc_endpoint = public_endpoint 'compute-xvpvnc'
109 109
 xvpvnc_bind = node['openstack']['bind_service']['all']['compute-xvpvnc']
110 110
 xvpvnc_bind_address = bind_address xvpvnc_bind
@@ -142,7 +142,7 @@ node.default['openstack']['compute']['conf_secrets']
142 142
 .[]('neutron')['metadata_proxy_shared_secret'] =
143 143
   get_password 'token', 'neutron_metadata_secret'
144 144
 
145
-auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
145
+auth_url = ::URI.decode identity_endpoint.to_s
146 146
 node.default['openstack']['compute']['conf_secrets']
147 147
   .[]('keystone_authtoken')['password'] =
148 148
   get_password 'service', 'openstack-compute'

Loading…
Cancel
Save