openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "authtoken: Make password required"

This commit is contained in:
Zuul 2023-07-17 00:05:36 +00:00 committed by Gerrit Code Review
parent 72a6a286f9 416df9fc39
commit 13128ddf6c
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/keystone/authtoken.pp
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 'neutron'
#
# [*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 neutron::keystone::authtoken(
String[1] $password,
$username = 'neutron',
$password = $facts['os_service_default'],
$auth_url = 'http://localhost:5000',
$project_name = 'services',
$user_domain_name = 'Default',
@ -238,10 +237,6 @@ class neutron::keystone::authtoken(
include neutron::deps
if is_service_default($password) {
fail('Please set password for neutron service user')
}
keystone::resource::authtoken {
'neutron_config':
* => $params;