From f1f2036937514a9cfb1a67c45c6601295223c885 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 12 Jul 2023 22:01:29 +0900
Subject: [PATCH] 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: I1019f4616bc0bbbc4c180fbf057da4f71ae4253d
---
 manifests/keystone/authtoken.pp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index c4bca97..bb1b4ed 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -4,14 +4,13 @@
 #
 # === Parameters
 #
+# [*password*]
+#   (Required) Password to create for the service user
+#
 # [*username*]
 #   (Optional) The name of the service user
 #   Defaults to 'magnum'
 #
-# [*password*]
-#   (Required) 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'
@@ -191,8 +190,8 @@
 #  Defaults to $facts['os_service_default'].
 #
 class magnum::keystone::authtoken(
+  String[1] $password,
   $username                       = 'magnum',
-  $password                       = $facts['os_service_default'],
   $auth_url                       = 'http://localhost:5000',
   $project_name                   = 'services',
   $user_domain_name               = 'Default',
@@ -232,10 +231,6 @@ class magnum::keystone::authtoken(
 
   include magnum::deps
 
-  if is_service_default($password) {
-    fail('Please set password for magnum service user')
-  }
-
   keystone::resource::authtoken { 'magnum_config':
     username                       => $username,
     password                       => $password,