openstack/puppet-openstacklib
Code Issues Proposed changes

Require wsgi script parameters

Browse Source 
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
This commit is contained in:
Takashi Kajinami
2025-05-26 16:59:21 +09:00
parent 058171d64a
commit 9d3d43d832
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
manifests/wsgi/apache.pp
View File

@@ -22,6 +22,15 @@
# #
# == Parameters # == 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*] # [*service_name*]
# (Optional) Name of the service to run. # (Optional) Name of the service to run.
# Example: nova-api # Example: nova-api
@@ -116,18 +125,6 @@
# (Optional) Name of the WSGI process group. # (Optional) Name of the WSGI process group.
# Defaults to $name # 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*] # [*wsgi_application_group*]
# (Optional) The application group of the WSGI script. # (Optional) The application group of the WSGI script.
# Defaults to '%{GLOBAL}' # Defaults to '%{GLOBAL}'
@@ -242,6 +239,9 @@
# Defaults to undef # Defaults to undef
# #
define openstacklib::wsgi::apache ( define openstacklib::wsgi::apache (
Stdlib::Absolutepath $wsgi_script_dir,
String[1] $wsgi_script_file,
Stdlib::Absolutepath $wsgi_script_source,
$service_name = $name, $service_name = $name,
$servername = $facts['networking']['fqdn'], $servername = $facts['networking']['fqdn'],
$bind_host = undef, $bind_host = undef,
@@ -265,9 +265,6 @@ define openstacklib::wsgi::apache (
$wsgi_daemon_process = $name, $wsgi_daemon_process = $name,
$wsgi_process_display_name = $name, $wsgi_process_display_name = $name,
$wsgi_process_group = $name, $wsgi_process_group = $name,
$wsgi_script_dir = undef,
$wsgi_script_file = undef,
$wsgi_script_source = undef,
$wsgi_application_group = '%{GLOBAL}', $wsgi_application_group = '%{GLOBAL}',
$wsgi_pass_authorization = undef, $wsgi_pass_authorization = undef,
$wsgi_chunked_request = undef, $wsgi_chunked_request = undef,