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: I4fc9a34db162b6c85a5f4bcf50c3fb77b1b6640d
This commit is contained in:
parent
d308b77467
commit
6b846d600a
|
@ -4,14 +4,13 @@
|
|||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*password*]
|
||||
# (Required) Password to create for the service user
|
||||
#
|
||||
# [*username*]
|
||||
# (Optional) The name of the service user
|
||||
# Defaults to 'glance'
|
||||
#
|
||||
# [*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://127.0.0.1:5000'
|
||||
|
@ -196,8 +195,8 @@
|
|||
# authtoken class. Values set here override the individual parameters above.
|
||||
#
|
||||
class glance::api::authtoken(
|
||||
String[1] $password,
|
||||
$username = 'glance',
|
||||
$password = $facts['os_service_default'],
|
||||
$auth_url = 'http://127.0.0.1:5000',
|
||||
$project_name = 'services',
|
||||
$user_domain_name = 'Default',
|
||||
|
@ -238,10 +237,6 @@ class glance::api::authtoken(
|
|||
|
||||
include glance::deps
|
||||
|
||||
if is_service_default($password) {
|
||||
fail('Please set password for Glance service user')
|
||||
}
|
||||
|
||||
keystone::resource::authtoken {
|
||||
'glance_api_config':
|
||||
* => $params;
|
||||
|
|
Loading…
Reference in New Issue