Merge "authtoken: Make password required"

This commit is contained in:
Zuul 2023-06-25 22:52:10 +00:00 committed by Gerrit Code Review
commit 0827e06a1d
1 changed files with 4 additions and 9 deletions

View File

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