From a5402c1e01b74dd21b699e6b972570e376e5ec5e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 30 Jul 2022 22:35:16 +0900
Subject: [PATCH] Adapt to new type validation in puppetlabs-apache

The puppetlabs-apache module is enforcing more strict data type
validation[1].

This change updates the default values to adapt to that change.

[1] https://github.com/puppetlabs/puppetlabs-apache/commit/f41251e336fa3e7c31c19968ccee74121cf71e47

Closes-Bug: #1983300
Depends-on: https://review.opendev.org/851652
Change-Id: Ic9cf630f6f1a8907e069ed10728f2a8c50b75d79
---
 manifests/wsgi/apache.pp                  | 18 +++++++++---------
 spec/classes/keystone_wsgi_apache_spec.rb | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 786acb126..d187f12fd 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -64,7 +64,7 @@
 #
 # [*priority*]
 #   (Optional) The priority for the vhost.
-#   Defaults to '10'
+#   Defaults to 10
 #
 # [*threads*]
 #   (Optional) The number of threads for the vhost.
@@ -94,19 +94,19 @@
 #
 # [*access_log_file*]
 #   (Optional) The log file name for the virtualhost.
-#   Defaults to false
+#   Defaults to undef
 #
 # [*access_log_pipe*]
 #   (Optional) Specifies a pipe where Apache sends access logs for the virtualhost.
-#   Defaults to false
+#   Defaults to undef
 #
 # [*access_log_syslog*]
 #   (Optional) Sends the virtualhost access log messages to syslog.
-#   Defaults to false
+#   Defaults to undef
 #
 # [*access_log_format*]
 #   (Optional) The log format for the virtualhost.
-#   Defaults to false
+#   Defaults to undef
 #
 # [*error_log_file*]
 #   (Optional) The error log file name for the virtualhost.
@@ -153,10 +153,10 @@ class keystone::wsgi::apache (
   $wsgi_pass_authorization           = 'On',
   $wsgi_chunked_request              = undef,
   $wsgi_script_source                = '/usr/bin/keystone-wsgi-public',
-  $access_log_file                   = false,
-  $access_log_pipe                   = false,
-  $access_log_syslog                 = false,
-  $access_log_format                 = false,
+  $access_log_file                   = undef,
+  $access_log_pipe                   = undef,
+  $access_log_syslog                 = undef,
+  $access_log_format                 = undef,
   $error_log_file                    = undef,
   $error_log_pipe                    = undef,
   $error_log_syslog                  = undef,
diff --git a/spec/classes/keystone_wsgi_apache_spec.rb b/spec/classes/keystone_wsgi_apache_spec.rb
index 476b7c95e..25086cbe5 100644
--- a/spec/classes/keystone_wsgi_apache_spec.rb
+++ b/spec/classes/keystone_wsgi_apache_spec.rb
@@ -23,7 +23,7 @@ describe 'keystone::wsgi::apache' do
         :workers                     => facts[:os_workers_keystone],
         :threads                     => 1,
         :user                        => 'keystone',
-        :priority                    => '10',
+        :priority                    => 10,
         :ssl                         => false,
         :wsgi_daemon_process         => 'keystone',
         :wsgi_process_display_name   => 'keystone',
@@ -35,10 +35,10 @@ describe 'keystone::wsgi::apache' do
         :wsgi_pass_authorization     => 'On',
         :headers                     => nil,
         :custom_wsgi_process_options => {},
-        :access_log_file             => false,
-        :access_log_pipe             => false,
-        :access_log_syslog           => false,
-        :access_log_format           => false,
+        :access_log_file             => nil,
+        :access_log_pipe             => nil,
+        :access_log_syslog           => nil,
+        :access_log_format           => nil,
         :error_log_file              => nil,
         :error_log_pipe              => nil,
         :error_log_syslog            => nil,
@@ -62,7 +62,7 @@ describe 'keystone::wsgi::apache' do
           :ssl_crl                     => 'crl',
           :ssl_certs_dir               => '/etc/ssl/certs',
           :threads                     => 10,
-          :priority                    => '20',
+          :priority                    => 20,
           :wsgi_application_group      => 'group',
           :wsgi_pass_authorization     => 'Off',
           :wsgi_chunked_request        => 'On',