openstack/puppet-keystone
Code Issues Proposed changes

admin_user_domain and admin_project_domain can now be equal

Browse Source 
Allow to set the same domain name for admin_user_domain and
admin_project_domain.

Due to a logic issue, it was not possible until this patch.

Change-Id: If8a29290271142bb3ac254ed8e504047abc87153
Closes-bug: #1474049
This commit is contained in:
Emilien Macchi 2015-07-24 16:17:16 -04:00
parent 8f5286557f
commit a4c17955c7
2 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
manifests/roles/admin.pp
View File

@ -92,37 +92,10 @@ class keystone::roles::admin(
$service_project_domain = undef,
) {
if $service_project_domain {
if $service_project_domain != $admin_user_domain {
if $service_project_domain != $admin_project_domain {
keystone_domain { $service_project_domain:
ensure => present,
enabled => true,
}
}
}
}
if $admin_project_domain {
if $admin_project_domain != $admin_user_domain {
if $service_project_domain != $admin_project_domain {
keystone_domain { $admin_project_domain:
ensure => present,
enabled => true,
}
}
}
}
if $admin_user_domain {
if $admin_project_domain != $admin_user_domain {
if $service_project_domain != $admin_user_domain {
keystone_domain { $admin_user_domain:
ensure => present,
enabled => true,
}
}
}
$domains = unique(delete_undef_values([ $admin_user_domain, $admin_project_domain, $service_project_domain]))
keystone_domain { $domains:
ensure => present,
enabled => true,
}
keystone_tenant { $service_tenant:

11
spec/classes/keystone_roles_admin_spec.rb
View File

@ -173,4 +173,15 @@ describe 'keystone::roles::admin' do
end
describe 'when admin_user_domain and admin_project_domain are equal' do
let :params do
{
:email => 'foo@bar',
:password => 'ChangeMe',
:admin_user_domain => 'admin_domain',
:admin_project_domain => 'admin_domain',
}
end
it { is_expected.to contain_keystone_domain('admin_domain') }
end
end