Merge "Switch to www_authenticate_uri for cinder"

This commit is contained in:
Zuul 2018-04-24 20:43:33 +00:00 committed by Gerrit Code Review
commit 5939979bc4

View File

@ -92,12 +92,12 @@ class openstack_integration::cinder (
$keymgr_encryption_auth_url = undef
}
class { '::cinder::keystone::authtoken':
password => 'a_big_secret',
user_domain_name => 'Default',
project_domain_name => 'Default',
auth_url => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers,
password => 'a_big_secret',
user_domain_name => 'Default',
project_domain_name => 'Default',
auth_url => $::openstack_integration::config::keystone_admin_uri,
www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers,
}
if ($::os_package_type == 'debian') {
$service_name = 'cinder-api'