openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Use internal identity endpoint for services 

Depends-On: Id74966d9f1279f725bc41c08e434230a7845bbc1
Change-Id: Ibce1f2d4796e44941df4b7256de786e49a7386cc
This commit is contained in:
Samuel Cassiba 2018-07-16 12:38:24 -07:00
parent 4992010231
commit 79b76424f3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/identity_registration.rb
View File

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

4
recipes/nova-common.rb
View File

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