authtoken: Make password required
The password parameter is not really optional. This makes it a required parameter to give more sensible validation error. Change-Id: Id6fc79b9725e9c88e90b06c002ccfde59c75b089
This commit is contained in:
parent
47e7587063
commit
f95fa42e81
@ -4,14 +4,13 @@
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*password*]
|
||||
# (Required) Password to create for the service user
|
||||
#
|
||||
# [*username*]
|
||||
# (Optional) The name of the service user
|
||||
# Defaults to 'cinder'
|
||||
#
|
||||
# [*password*]
|
||||
# (Optional) Password to create for the service user
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# [*auth_url*]
|
||||
# (Optional) The URL to use for authentication.
|
||||
# Defaults to 'http://localhost:5000'.
|
||||
@ -201,8 +200,8 @@
|
||||
# authtoken class. Values set here override the individual parameters above.
|
||||
#
|
||||
class cinder::keystone::authtoken(
|
||||
String[1] $password,
|
||||
$username = 'cinder',
|
||||
$password = $facts['os_service_default'],
|
||||
$auth_url = 'http://localhost:5000',
|
||||
$project_name = 'services',
|
||||
$user_domain_name = 'Default',
|
||||
@ -243,10 +242,6 @@ class cinder::keystone::authtoken(
|
||||
|
||||
include cinder::deps
|
||||
|
||||
if is_service_default($password) {
|
||||
fail('Please set password for cinder service user')
|
||||
}
|
||||
|
||||
keystone::resource::authtoken {
|
||||
'cinder_config':
|
||||
* => $params;
|
||||
|
Loading…
Reference in New Issue
Block a user