summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Cassiba <s@cassiba.com>2018-07-16 12:34:30 -0700
committerSamuel Cassiba <s@cassiba.com>2018-07-16 12:35:38 -0700
commitb27c620954c5fd2f484c112d86be7040ae2d7732 (patch)
tree5c229efbcacfb9bb30876875bf76f9c90f1c9945
parent93882de60329d91fdb9ba6ad5515a94312f570a8 (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:57:50 +0000 Reviewed-on: https://review.openstack.org/583031 Project: openstack/cookbook-openstack-block-storage Branch: refs/heads/master
-rw-r--r--recipes/cinder-common.rb4
-rw-r--r--recipes/identity_registration.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes/cinder-common.rb b/recipes/cinder-common.rb
index 09c50c4..3e40703 100644
--- a/recipes/cinder-common.rb
+++ b/recipes/cinder-common.rb
@@ -48,12 +48,12 @@ end
48glance_api_endpoint = internal_endpoint 'image_api' 48glance_api_endpoint = internal_endpoint 'image_api'
49cinder_api_bind = node['openstack']['bind_service']['all']['block-storage'] 49cinder_api_bind = node['openstack']['bind_service']['all']['block-storage']
50cinder_api_bind_address = bind_address cinder_api_bind 50cinder_api_bind_address = bind_address cinder_api_bind
51identity_endpoint = public_endpoint 'identity' 51identity_endpoint = internal_endpoint 'identity'
52node.default['openstack']['block-storage']['conf_secrets'] 52node.default['openstack']['block-storage']['conf_secrets']
53 .[]('keystone_authtoken')['password'] = 53 .[]('keystone_authtoken')['password'] =
54 get_password 'service', 'openstack-block-storage' 54 get_password 'service', 'openstack-block-storage'
55 55
56auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version'] 56auth_url = ::URI.decode identity_endpoint.to_s
57 57
58directory '/etc/cinder' do 58directory '/etc/cinder' do
59 group node['openstack']['block-storage']['group'] 59 group node['openstack']['block-storage']['group']
diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb
index 4eb8a66..f64b151 100644
--- a/recipes/identity_registration.rb
+++ b/recipes/identity_registration.rb
@@ -26,8 +26,8 @@ class ::Chef::Recipe
26 include ::Openstack 26 include ::Openstack
27end 27end
28 28
29identity_endpoint = public_endpoint 'identity' 29identity_endpoint = internal_endpoint 'identity'
30auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version'] 30auth_url = ::URI.decode identity_endpoint.to_s
31 31
32interfaces = { 32interfaces = {
33 public: { url: public_endpoint('block-storage') }, 33 public: { url: public_endpoint('block-storage') },