diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 6995633..6c4144b 100755 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -21,11 +21,11 @@ # # [*user_domain_name*] # (Optional) Name of domain for $username -# Defaults to $::os_service_default +# Defaults to 'Default' # # [*project_domain_name*] # (Optional) Name of domain for $project_name -# Defaults to $::os_service_default +# Defaults to 'Default' # # [*insecure*] # (Optional) If true, explicitly allow TLS without checking server cert @@ -188,8 +188,8 @@ class magnum::keystone::authtoken( $username = 'magnum', $auth_url = 'http://localhost:35357', $project_name = 'services', - $user_domain_name = $::os_service_default, - $project_domain_name = $::os_service_default, + $user_domain_name = 'Default', + $project_domain_name = 'Default', $insecure = $::os_service_default, $auth_section = $::os_service_default, $auth_type = 'password', diff --git a/releasenotes/notes/default_domain-b63fcbe67240bd42.yaml b/releasenotes/notes/default_domain-b63fcbe67240bd42.yaml new file mode 100644 index 0000000..7394505 --- /dev/null +++ b/releasenotes/notes/default_domain-b63fcbe67240bd42.yaml @@ -0,0 +1,6 @@ +--- +issues: + - | + Keystone v2.0 API was removed so we need to set a default value + for user_domain_name and project_domain name, which will be + Default as it is already in some other classes in modules. diff --git a/spec/classes/magnum_keystone_authtoken_spec.rb b/spec/classes/magnum_keystone_authtoken_spec.rb index 3798e92..57be007 100755 --- a/spec/classes/magnum_keystone_authtoken_spec.rb +++ b/spec/classes/magnum_keystone_authtoken_spec.rb @@ -22,8 +22,8 @@ describe 'magnum::keystone::authtoken' do 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('') - is_expected.to contain_magnum_config('keystone_authtoken/project_domain_name').with_value('') + is_expected.to contain_magnum_config('keystone_authtoken/user_domain_name').with_value('Default') + is_expected.to contain_magnum_config('keystone_authtoken/project_domain_name').with_value('Default') is_expected.to contain_magnum_config('keystone_authtoken/insecure').with_value('') is_expected.to contain_magnum_config('keystone_authtoken/auth_section').with_value('') is_expected.to contain_magnum_config('keystone_authtoken/auth_type').with_value('password')