From 9d3d43d8327dfcef98efb0c6a02a8d923aa1c3de Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 26 May 2025 16:59:21 +0900
Subject: [PATCH] Require wsgi script parameters

These parameters are used to determine path for file/directory
resources, regardless of their values. Make sure these parameters get
valid values to avoid unexpected failures caused by unset parameters.

Change-Id: I5ee01f619c63e448821d85d949df58ab4e809b2f
---
 manifests/wsgi/apache.pp | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index cec438c9..01d370d9 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -22,6 +22,15 @@
 #
 # == Parameters
 #
+# [*wsgi_script_dir*]
+#   (Required) The directory path of the WSGI script.
+#
+# [*wsgi_script_file*]
+#   (Required) The file path of the WSGI script.
+#
+# [*wsgi_script_source*]
+#   (Required) The source of the WSGI script.
+#
 # [*service_name*]
 #   (Optional) Name of the service to run.
 #   Example: nova-api
@@ -116,18 +125,6 @@
 #   (Optional) Name of the WSGI process group.
 #   Defaults to $name
 #
-# [*wsgi_script_dir*]
-#   (Optional) The directory path of the WSGI script.
-#   Defaults to undef
-#
-# [*wsgi_script_file*]
-#   (Optional) The file path of the WSGI script.
-#   Defaults to undef
-#
-# [*wsgi_script_source*]
-#   (Optional) The source of the WSGI script.
-#   Defaults to undef
-#
 # [*wsgi_application_group*]
 #   (Optional) The application group of the WSGI script.
 #   Defaults to '%{GLOBAL}'
@@ -242,6 +239,9 @@
 #   Defaults to undef
 #
 define openstacklib::wsgi::apache (
+  Stdlib::Absolutepath $wsgi_script_dir,
+  String[1] $wsgi_script_file,
+  Stdlib::Absolutepath $wsgi_script_source,
   $service_name                = $name,
   $servername                  = $facts['networking']['fqdn'],
   $bind_host                   = undef,
@@ -265,9 +265,6 @@ define openstacklib::wsgi::apache (
   $wsgi_daemon_process         = $name,
   $wsgi_process_display_name   = $name,
   $wsgi_process_group          = $name,
-  $wsgi_script_dir             = undef,
-  $wsgi_script_file            = undef,
-  $wsgi_script_source          = undef,
   $wsgi_application_group      = '%{GLOBAL}',
   $wsgi_pass_authorization     = undef,
   $wsgi_chunked_request        = undef,