openstack
/
puppet-heat
Code Issues Proposed changes

Missing domain in keystone::domain 

The domain name wasn't used for the keystone_user_role resource.

This change requires "replace indirection calls" [1]
Both needs to be merged as same time in order to pass CI tests.

[1] https://review.openstack.org/226624

Change-Id: I2a717b06a73af966d6625b4f6ec3254baf7c50a0
Depends-On: I36fabf547fa50fc14d49f491f11cb4a0571f7d31
This commit is contained in:
Gilles Dubreuil 2015-10-08 17:44:10 +11:00
parent 06953c3d44
commit f592e646c4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/keystone/domain.pp
View File

@ -79,7 +79,7 @@ class heat::keystone::domain (
'password' => $domain_password,
'domain' => $domain_name,
})
ensure_resource('keystone_user_role', "${domain_admin}@::${domain_name}", {
ensure_resource('keystone_user_role', "${domain_admin}::${domain_name}@::${domain_name}", {
'roles' => ['admin'],
})

2
spec/classes/heat_keystone_domain_spec.rb
View File

@ -33,7 +33,7 @@ describe 'heat::keystone::domain' do
:password => params[:domain_password],
:domain => params[:domain_name],
)
is_expected.to contain_keystone_user_role('heat_admin@::heat').with(
is_expected.to contain_keystone_user_role('heat_admin::heat@::heat').with(
:roles => ['admin'],
)
end