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: I0de636a2ca00757ef24552a0c9a97ee95e485d19
This commit is contained in:
parent
160b0b18d1
commit
f6af383762
@ -4,14 +4,13 @@
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*password*]
|
||||
# (Required) Password to create for the service user
|
||||
#
|
||||
# [*username*]
|
||||
# (Optional) The name of the service user
|
||||
# Defaults to 'trove'
|
||||
#
|
||||
# [*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'
|
||||
@ -197,8 +196,8 @@
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
class trove::keystone::authtoken(
|
||||
String[1] $password,
|
||||
$username = 'trove',
|
||||
$password = $facts['os_service_default'],
|
||||
$auth_url = 'http://localhost:5000',
|
||||
$project_name = 'services',
|
||||
$user_domain_name = 'Default',
|
||||
@ -238,10 +237,6 @@ class trove::keystone::authtoken(
|
||||
|
||||
include trove::deps
|
||||
|
||||
if is_service_default($password) {
|
||||
fail('Please set password for trove service user')
|
||||
}
|
||||
|
||||
keystone::resource::authtoken { 'trove_config':
|
||||
username => $username,
|
||||
password => $password,
|
||||
|
Loading…
x
Reference in New Issue
Block a user