Merge "Fix magnum cluster TLS cert generation"

This commit is contained in:
Jenkins 2017-09-06 07:24:23 +00:00 committed by Gerrit Code Review
commit 3081f9d6f4
2 changed files with 12 additions and 0 deletions

View File

@ -258,4 +258,10 @@ class magnum::keystone::authtoken(
revocation_cache_time => $revocation_cache_time,
token_cache_time => $token_cache_time,
}
magnum_config {
'keystone_authtoken/admin_tenant_name': value => $project_name;
'keystone_authtoken/admin_user' : value => $username;
'keystone_authtoken/admin_password' : value => $password, secret => true;
}
}

View File

@ -19,6 +19,9 @@ describe 'magnum::keystone::authtoken' do
is_expected.to contain_magnum_config('keystone_authtoken/password').with_value('magnum_password')
is_expected.to contain_magnum_config('keystone_authtoken/auth_url').with_value('http://localhost:35357')
is_expected.to contain_magnum_config('keystone_authtoken/project_name').with_value('services')
is_expected.to contain_magnum_config('keystone_authtoken/admin_user').with_value('magnum')
is_expected.to contain_magnum_config('keystone_authtoken/admin_password').with_value('magnum_password')
is_expected.to contain_magnum_config('keystone_authtoken/admin_tenant_name').with_value('services')
is_expected.to contain_magnum_config('keystone_authtoken/user_domain_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_magnum_config('keystone_authtoken/project_domain_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_magnum_config('keystone_authtoken/insecure').with_value('<SERVICE DEFAULT>')
@ -99,6 +102,9 @@ describe 'magnum::keystone::authtoken' do
is_expected.to contain_magnum_config('keystone_authtoken/password').with_value(params[:password]).with_secret(true)
is_expected.to contain_magnum_config('keystone_authtoken/auth_url').with_value(params[:auth_url])
is_expected.to contain_magnum_config('keystone_authtoken/project_name').with_value(params[:project_name])
is_expected.to contain_magnum_config('keystone_authtoken/admin_user').with_value(params[:username])
is_expected.to contain_magnum_config('keystone_authtoken/admin_password').with_value(params[:password]).with_secret(true)
is_expected.to contain_magnum_config('keystone_authtoken/admin_tenant_name').with_value(params[:project_name])
is_expected.to contain_magnum_config('keystone_authtoken/user_domain_name').with_value(params[:user_domain_name])
is_expected.to contain_magnum_config('keystone_authtoken/project_domain_name').with_value(params[:project_domain_name])
is_expected.to contain_magnum_config('keystone_authtoken/insecure').with_value(params[:insecure])