diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index cf305a85..5fcffa35 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -22,11 +22,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 @@ -197,8 +197,8 @@ class trove::keystone::authtoken( $password = $::os_service_default, $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-a75b4fc5a094f93d.yaml b/releasenotes/notes/default_domain-a75b4fc5a094f93d.yaml new file mode 100644 index 00000000..7394505c --- /dev/null +++ b/releasenotes/notes/default_domain-a75b4fc5a094f93d.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/trove_keystone_authtoken_spec.rb b/spec/classes/trove_keystone_authtoken_spec.rb index 59d1397b..c73c5cb3 100644 --- a/spec/classes/trove_keystone_authtoken_spec.rb +++ b/spec/classes/trove_keystone_authtoken_spec.rb @@ -15,8 +15,8 @@ describe 'trove::keystone::authtoken' do is_expected.to contain_trove_config('keystone_authtoken/password').with_value('trove_password') is_expected.to contain_trove_config('keystone_authtoken/auth_url').with_value('http://localhost:35357') is_expected.to contain_trove_config('keystone_authtoken/project_name').with_value('services') - is_expected.to contain_trove_config('keystone_authtoken/user_domain_name').with_value('') - is_expected.to contain_trove_config('keystone_authtoken/project_domain_name').with_value('') + is_expected.to contain_trove_config('keystone_authtoken/user_domain_name').with_value('Default') + is_expected.to contain_trove_config('keystone_authtoken/project_domain_name').with_value('Default') is_expected.to contain_trove_config('keystone_authtoken/insecure').with_value('') is_expected.to contain_trove_config('keystone_authtoken/auth_section').with_value('') is_expected.to contain_trove_config('keystone_authtoken/auth_type').with_value('password')