Merge "authtoken: Make password required"
This commit is contained in:
commit
0827e06a1d
|
@ -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 'aodh'
|
# Defaults to 'aodh'
|
||||||
#
|
#
|
||||||
# [*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 aodh::keystone::authtoken(
|
class aodh::keystone::authtoken(
|
||||||
|
String[1] $password,
|
||||||
$username = 'aodh',
|
$username = 'aodh',
|
||||||
$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 aodh::keystone::authtoken(
|
||||||
|
|
||||||
include aodh::deps
|
include aodh::deps
|
||||||
|
|
||||||
if is_service_default($password) {
|
|
||||||
fail('Please set password for Aodh service user')
|
|
||||||
}
|
|
||||||
|
|
||||||
keystone::resource::authtoken {
|
keystone::resource::authtoken {
|
||||||
'aodh_config':
|
'aodh_config':
|
||||||
* => $params;
|
* => $params;
|
||||||
|
|
Loading…
Reference in New Issue