Use internal identity endpoint for services
Depends-On: Id74966d9f1279f725bc41c08e434230a7845bbc1 Change-Id: Ibce1f2d4796e44941df4b7256de786e49a7386cc
This commit is contained in:
parent
4992010231
commit
79b76424f3
|
@ -25,7 +25,7 @@ class ::Chef::Recipe
|
|||
include ::Openstack
|
||||
end
|
||||
|
||||
identity_endpoint = public_endpoint 'identity'
|
||||
identity_endpoint = internal_endpoint 'identity'
|
||||
interfaces = {
|
||||
public: { url: public_endpoint('compute-api') },
|
||||
internal: { url: internal_endpoint('compute-api') },
|
||||
|
@ -35,7 +35,7 @@ placement_interfaces = {
|
|||
public: { url: public_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_user = node['openstack']['compute']['conf']['keystone_authtoken']['username']
|
||||
placement_service_pass = get_password 'service', 'openstack-placement'
|
||||
|
|
|
@ -104,7 +104,7 @@ memcache_servers = memcached_servers.join ','
|
|||
# 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
|
||||
# for those.
|
||||
identity_endpoint = public_endpoint 'identity'
|
||||
identity_endpoint = internal_endpoint 'identity'
|
||||
xvpvnc_endpoint = public_endpoint 'compute-xvpvnc'
|
||||
xvpvnc_bind = node['openstack']['bind_service']['all']['compute-xvpvnc']
|
||||
xvpvnc_bind_address = bind_address xvpvnc_bind
|
||||
|
@ -142,7 +142,7 @@ node.default['openstack']['compute']['conf_secrets']
|
|||
.[]('neutron')['metadata_proxy_shared_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']
|
||||
.[]('keystone_authtoken')['password'] =
|
||||
get_password 'service', 'openstack-compute'
|
||||
|
|
Loading…
Reference in New Issue