openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Add www_authenticate_uri to plumgrid plugin"

This commit is contained in:
Zuul 2019-01-16 03:57:14 +00:00 committed by Gerrit Code Review
parent 32a3d7d5c6 b19a3fa24b
commit 2ffa25a438
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/plugins/plumgrid.pp
View File

@ -181,7 +181,10 @@ class neutron::plugins::plumgrid (
neutron_plumlib_plumgrid {
'keystone_authtoken/admin_user' : value => 'admin';
'keystone_authtoken/admin_password': value => $admin_password, secret =>true;
# TODO(tobias-urdin): Remove auth_uri when we know www_authenticate_uri is working until then
# we keep duplicates here.
'keystone_authtoken/auth_uri': value => "${auth_protocol}://${controller_priv_host}:5000/${identity_version}";
'keystone_authtoken/www_authenticate_uri': value => "${auth_protocol}://${controller_priv_host}:5000/${identity_version}";
'keystone_authtoken/admin_tenant_name': value => 'admin';
'keystone_authtoken/identity_version': value => $identity_version;
'keystone_authtoken/user_domain_name': value => $user_domain_name;

1
spec/classes/neutron_plugins_plumgrid_spec.rb
View File

@ -76,6 +76,7 @@ describe 'neutron::plugins::plumgrid' do
it 'should perform default configuration of plumgrid plumlib' do
auth_uri = params[:auth_protocol] + "://" + params[:controller_priv_host] + ":" + "5000/" + params[:identity_version];
should contain_neutron_plumlib_plumgrid('keystone_authtoken/auth_uri').with_value(auth_uri)
should contain_neutron_plumlib_plumgrid('keystone_authtoken/www_authenticate_uri').with_value(auth_uri)
should contain_neutron_plumlib_plumgrid('keystone_authtoken/identity_version').with_value(params[:identity_version])
should contain_neutron_plumlib_plumgrid('keystone_authtoken/user_domain_name').with_value(params[:user_domain_name])
should contain_neutron_plumlib_plumgrid('PLUMgridMetadata/enable_pg_metadata').with_value('True')