Use internal identity endpoint for services

- uses internal Keystone endpoint for service-level communication
- removes use_inline_resources

Depends-On: Id74966d9f1279f725bc41c08e434230a7845bbc1
Depends-On: I161af1074cd17f2e3d2d2cf0b37a0c5fa1015fd3
Change-Id: Iabb4f3549fed0d8e0a5da0beb348ca29e5a14557
This commit is contained in:
Samuel Cassiba 2018-07-16 12:40:50 -07:00
parent 7696912e7a
commit e7f5813c75
5 changed files with 7 additions and 9 deletions

View File

@ -21,8 +21,6 @@
include ::Openstack
use_inline_resources
action :upload do
@user = new_resource.identity_user
@pass = new_resource.identity_pass

View File

@ -68,8 +68,8 @@ node.default['openstack']['image_api']['conf_secrets']
.[]('keystone_authtoken')['password'] =
get_password 'service', 'openstack-image'
identity_endpoint = public_endpoint 'identity'
auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
identity_endpoint = internal_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s
db_user = node['openstack']['db']['image']['username']
db_pass = get_password 'db', 'glance'

View File

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

View File

@ -33,7 +33,7 @@ package 'curl' do
end
identity_endpoint = public_endpoint 'identity'
auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
auth_url = ::URI.decode identity_endpoint.to_s
# admin_user = node['openstack']['image_api']['conf']['keystone_authtoken']['username']
# admin_pass = get_password admin_user, admin_pass

View File

@ -45,8 +45,8 @@ registry_bind_address = bind_address registry_bind
node.default['openstack']['image_registry']['conf_secrets']
.[]('keystone_authtoken')['password'] = get_password 'service', 'openstack-image'
identity_endpoint = public_endpoint 'identity'
auth_url = auth_uri_transform identity_endpoint.to_s, node['openstack']['api']['auth']['version']
identity_endpoint = internal_endpoint 'identity'
auth_url = ::URI.decode identity_endpoint.to_s
glance_user = node['openstack']['image']['user']
glance_group = node['openstack']['image']['group']