openstack/puppet-zaqar
Code Issues Proposed changes

authtoken: Make password required

Browse Source 
The password parameter is not really optional. This makes it
a required parameter to give more sensible validation error.

Change-Id: I2df5e93dc3e428928d85b70d8666b8b44155298b
This commit is contained in:
Takashi Kajinami 2023-07-12 22:09:08 +09:00
parent 7d5258c9a9
commit a9d4fb7df1
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/keystone/authtoken.pp
View File

@ -4,14 +4,13 @@
# #
# === Parameters # === Parameters
# #
# [*password*]
# (Required) Password to create for the service user
#
# [*username*] # [*username*]
# (Optional) The name of the service user # (Optional) The name of the service user
# Defaults to 'zaqar' # Defaults to 'zaqar'
# #
# [*password*]
# (Optional) Password to create for the service user
# Defaults to $facts['os_service_default']
#
# [*auth_url*] # [*auth_url*]
# (Optional) The URL to use for authentication. # (Optional) The URL to use for authentication.
# Defaults to 'http://localhost:5000' # Defaults to 'http://localhost:5000'
@ -196,8 +195,8 @@
# authtoken class. Values set here override the individual parameters above. # authtoken class. Values set here override the individual parameters above.
# #
class zaqar::keystone::authtoken( class zaqar::keystone::authtoken(
String[1] $password,
$username = 'zaqar', $username = 'zaqar',
$password = $facts['os_service_default'],
$auth_url = 'http://localhost:5000', $auth_url = 'http://localhost:5000',
$project_name = 'services', $project_name = 'services',
$user_domain_name = 'Default', $user_domain_name = 'Default',
@ -238,10 +237,6 @@ class zaqar::keystone::authtoken(
include zaqar::deps include zaqar::deps
if is_service_default($password) {
fail('Please set password for Zaqar service user')
}
keystone::resource::authtoken { keystone::resource::authtoken {
'zaqar_config': 'zaqar_config':
* => $params; * => $params;