openstack
/
puppet-watcher
Code Issues Proposed changes

Merge "Remove logic dependent on the removed parameter"

This commit is contained in:
Zuul 2023-06-27 03:09:14 +00:00 committed by Gerrit Code Review
parent df8733d486 854d79fddb
commit 52633247c3
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/keystone/authtoken.pp
View File

@ -5,8 +5,7 @@
# === Parameters:
#
# [*password*]
# (Optional) Password to create for the service user
# Defaults to $facts['os_service_default']
# (Required) Password to create for the service user
#
# [*username*]
# (Optional) The name of the service user
@ -194,7 +193,7 @@
# Defaults to $facts['os_service_default'].
#
class watcher::keystone::authtoken (
$password = $facts['os_service_default'],
String[1] $password,
$username = 'watcher',
$auth_url = 'http://localhost:5000',
$project_name = 'services',
@ -235,12 +234,6 @@ class watcher::keystone::authtoken (
include watcher::deps
if is_service_default($password) and ! $::watcher::api::watcher_client_password {
fail('Please set password for watcher service user')
}
validate_legacy(String, 'validate_string', $password)
keystone::resource::authtoken { 'watcher_config':
password => $password,
username => $username,