openstack/puppet-manila
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: I36d065587938f7fb49df591c21d0267545d069b3
This commit is contained in:
Takashi Kajinami 2023-07-12 22:02:03 +09:00
parent fd90649c82
commit 997733a765
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/keystone/authtoken.pp
View File

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