From 588fe70ddf99d5a2eaa8d6fb2ccebdf02b489437 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 18 Dec 2023 01:33:03 +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: I38d4f000905ac01ac1cf50bfbc48cb30af609cf7
---
 manifests/api/authtoken.pp       | 13 ++++---------
 manifests/inspector/authtoken.pp | 13 ++++---------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp
index f5de7d08..fd9e7c0d 100644
--- a/manifests/api/authtoken.pp
+++ b/manifests/api/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 'ironic'
 #
-# [*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://127.0.0.1:5000'.
@@ -197,8 +196,8 @@
 #  authtoken class. Values set here override the individual parameters above.
 #
 class ironic::api::authtoken(
+  String[1] $password,
   $username                       = 'ironic',
-  $password                       = $facts['os_service_default'],
   $auth_url                       = 'http://127.0.0.1:5000',
   $project_name                   = 'services',
   $user_domain_name               = 'Default',
@@ -239,10 +238,6 @@ class ironic::api::authtoken(
 
   include ironic::deps
 
-  if is_service_default($password) {
-    fail('Please set password for Ironic API service user')
-  }
-
   keystone::resource::authtoken {
     'ironic_config':
       *                              => $params;
diff --git a/manifests/inspector/authtoken.pp b/manifests/inspector/authtoken.pp
index 86b91d5a..fc4597f5 100644
--- a/manifests/inspector/authtoken.pp
+++ b/manifests/inspector/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 'ironic'
 #
-# [*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://127.0.0.1:5000'.
@@ -196,8 +195,8 @@
 #  authtoken class. Values set here override the individual parameters above.
 #
 class ironic::inspector::authtoken(
+  String[1] $password,
   $username                       = 'ironic',
-  $password                       = $facts['os_service_default'],
   $auth_url                       = 'http://127.0.0.1:5000',
   $project_name                   = 'services',
   $user_domain_name               = 'Default',
@@ -238,10 +237,6 @@ class ironic::inspector::authtoken(
 
   include ironic::deps
 
-  if is_service_default($password) {
-    fail('Please set password for Ironic Inspector service user')
-  }
-
   keystone::resource::authtoken {
     'ironic_inspector_config':
       *                              => $params;