openstack/cookbook-openstack-block-storage
Code Issues Proposed changes

Use internal identity endpoint for services

Browse Source 
Depends-On: Id74966d9f1279f725bc41c08e434230a7845bbc1
Change-Id: I4d2cbcc860060ed6dfdc9f134c43c6c77bf9e9f7
This commit is contained in:
Samuel Cassiba
2018-07-16 12:34:30 -07:00
parent 93882de603
commit b27c620954
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/cinder-common.rb
View File

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

4
recipes/identity_registration.rb
View File

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