openstack
/
puppet-magnum
Code Issues Proposed changes

Add trustee_domain names to config 

This commit adds the trustee_domain_name and trustee_domain_admin_name
config options to the keystone domain configuration.

Change-Id: I5a3061a3559b7c8c30997450aae826f381d5eb97
Closes-bug: #1581372
This commit is contained in:
Nate Potter 2016-10-05 15:51:28 -07:00
parent 9b7bbc7927
commit 0087b05e09
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/keystone/domain.pp
View File

@ -66,20 +66,10 @@ class magnum::keystone::domain (
)
}
# TODO(vanditboy): wait for a bugfix https://bugs.launchpad.net/puppet-magnum/+bug/1581372 or wirte
# a custom type to get ID.
magnum_config {
#'trust/trustee_domain_id':
# value => $domain_name;
#'trust/trustee_domain_admin_id':
# value => $domain_admin;
'trust/trustee_domain_admin_password':
value => $domain_password,
secret => true;
'trust/trustee_domain_name': value => $domain_name;
'trust/trustee_domain_admin_name': value => $domain_admin;
'trust/trustee_domain_admin_password': value => $domain_password, secret => true;
}
}

5
releasenotes/notes/add-trustee-name-configs-a38c5012090a01a0.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- The domain_name and domain_admin parameters in magnum::keystone::domain
now set up the trust/trustee_domain_name and trust/trustee_domain_admin_name
config options.

4
spec/classes/magnum_keystone_domain_spec.rb
View File

@ -12,10 +12,10 @@ describe 'magnum::keystone::domain' do
shared_examples_for 'magnum keystone domain' do
it 'configure magnum.conf' do
#is_expected.to contain_magnum_config('trust/trustee_domain_admin_id').with_value(params[:domain_admin])
is_expected.to contain_magnum_config('trust/trustee_domain_admin_name').with_value(params[:domain_admin])
is_expected.to contain_magnum_config('trust/trustee_domain_admin_password').with_value(params[:domain_password])
is_expected.to contain_magnum_config('trust/trustee_domain_admin_password').with_secret(true)
#is_expected.to contain_magnum_config('trust/trustee_domain_id').with_value(params[:domain_name])
is_expected.to contain_magnum_config('trust/trustee_domain_name').with_value(params[:domain_name])
end
it 'should create keystone domain' do