Browse Source

Use internal identity endpoint for services

Depends-On: Id74966d9f1279f725bc41c08e434230a7845bbc1
Change-Id: I4d2cbcc860060ed6dfdc9f134c43c6c77bf9e9f7
changes/31/583031/1
Samuel Cassiba 11 months ago
parent
commit
b27c620954
2 changed files with 4 additions and 4 deletions
  1. 2
    2
      recipes/cinder-common.rb
  2. 2
    2
      recipes/identity_registration.rb

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

@@ -48,12 +48,12 @@ end
48 48
 glance_api_endpoint = internal_endpoint 'image_api'
49 49
 cinder_api_bind = node['openstack']['bind_service']['all']['block-storage']
50 50
 cinder_api_bind_address = bind_address cinder_api_bind
51
-identity_endpoint = public_endpoint 'identity'
51
+identity_endpoint = internal_endpoint 'identity'
52 52
 node.default['openstack']['block-storage']['conf_secrets']
53 53
   .[]('keystone_authtoken')['password'] =
54 54
   get_password 'service', 'openstack-block-storage'
55 55
 
56
-auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
56
+auth_url = ::URI.decode identity_endpoint.to_s
57 57
 
58 58
 directory '/etc/cinder' do
59 59
   group node['openstack']['block-storage']['group']

+ 2
- 2
recipes/identity_registration.rb View File

@@ -26,8 +26,8 @@ class ::Chef::Recipe
26 26
   include ::Openstack
27 27
 end
28 28
 
29
-identity_endpoint = public_endpoint 'identity'
30
-auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
29
+identity_endpoint = internal_endpoint 'identity'
30
+auth_url = ::URI.decode identity_endpoint.to_s
31 31
 
32 32
 interfaces = {
33 33
   public: { url: public_endpoint('block-storage') },

Loading…
Cancel
Save