Add keystone_region_name to magnum::keystone::domain
Is used to configure the trust/trustee_keystone_region_name configuration option. Change-Id: Id27849c76e4d970810b122ef478e333e82c0d495
This commit is contained in:
parent
24fd4179c3
commit
7faad823d1
@ -48,6 +48,11 @@
|
|||||||
# Auth interface used by instances/trustee.
|
# Auth interface used by instances/trustee.
|
||||||
# Defaults to 'public'.
|
# Defaults to 'public'.
|
||||||
#
|
#
|
||||||
|
# [*keystone_region_name*]
|
||||||
|
# Region in Identity service catalog to use for
|
||||||
|
# communication with the OpenStack service.
|
||||||
|
# Defaults to $::os_service_default.
|
||||||
|
#
|
||||||
# [*manage_domain*]
|
# [*manage_domain*]
|
||||||
# Whether manage or not the domain creation.
|
# Whether manage or not the domain creation.
|
||||||
# If using the default domain, it needs to be False because puppet-keystone
|
# If using the default domain, it needs to be False because puppet-keystone
|
||||||
@ -72,11 +77,12 @@ class magnum::keystone::domain (
|
|||||||
$domain_password = 'changeme',
|
$domain_password = 'changeme',
|
||||||
$domain_admin_domain_name = $::os_service_default,
|
$domain_admin_domain_name = $::os_service_default,
|
||||||
$domain_admin_domain_id = $::os_service_default,
|
$domain_admin_domain_id = $::os_service_default,
|
||||||
|
$roles = $::os_service_default,
|
||||||
|
$keystone_interface = 'public',
|
||||||
|
$keystone_region_name = $::os_service_default,
|
||||||
$manage_domain = true,
|
$manage_domain = true,
|
||||||
$manage_user = true,
|
$manage_user = true,
|
||||||
$manage_role = true,
|
$manage_role = true,
|
||||||
$roles = $::os_service_default,
|
|
||||||
$keystone_interface = 'public'
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include magnum::deps
|
include magnum::deps
|
||||||
@ -118,6 +124,7 @@ class magnum::keystone::domain (
|
|||||||
'trust/trustee_domain_admin_password': value => $domain_password, secret => true;
|
'trust/trustee_domain_admin_password': value => $domain_password, secret => true;
|
||||||
'trust/roles': value => $roles;
|
'trust/roles': value => $roles;
|
||||||
'trust/trustee_keystone_interface': value => $keystone_interface;
|
'trust/trustee_keystone_interface': value => $keystone_interface;
|
||||||
|
'trust/trustee_keystone_region_name': value => $keystone_region_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Added keystone_region_name parameter to magnum::keystone::domain class.
|
@ -13,7 +13,8 @@ describe 'magnum::keystone::domain' do
|
|||||||
:domain_admin_email => 'magnum_admin@localhost',
|
:domain_admin_email => 'magnum_admin@localhost',
|
||||||
:domain_password => 'domain_passwd',
|
:domain_password => 'domain_passwd',
|
||||||
:roles => 'admin,',
|
:roles => 'admin,',
|
||||||
:keystone_interface => 'public'
|
:keystone_interface => 'public',
|
||||||
|
:keystone_region_name => 'RegionOne'
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -30,6 +31,7 @@ describe 'magnum::keystone::domain' do
|
|||||||
is_expected.to contain_magnum_config('trust/trustee_domain_id').with_value(params[:domain_id])
|
is_expected.to contain_magnum_config('trust/trustee_domain_id').with_value(params[:domain_id])
|
||||||
is_expected.to contain_magnum_config('trust/roles').with_value(params[:roles])
|
is_expected.to contain_magnum_config('trust/roles').with_value(params[:roles])
|
||||||
is_expected.to contain_magnum_config('trust/trustee_keystone_interface').with_value(params[:keystone_interface])
|
is_expected.to contain_magnum_config('trust/trustee_keystone_interface').with_value(params[:keystone_interface])
|
||||||
|
is_expected.to contain_magnum_config('trust/trustee_keystone_region_name').with_value(params[:keystone_region_name])
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should create keystone domain' do
|
it 'should create keystone domain' do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user