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] f41251e336

Closes-Bug: #1983300
Depends-on: https://review.opendev.org/851652
Change-Id: I2df44be85cb73144ce45b8f5bea2ccba64d0be86

manifests/wsgi/apache.pp

@@ -50,7 +50,7 @@
 #
 #   [*priority*]
 #     (optional) The priority for the vhost.
-#     Defaults to '10'
+#     Defaults to 10
 #
 #   [*threads*]
 #     (optional) The number of threads for the vhost.
@@ -68,11 +68,11 @@
 #
 #   [*access_log_file*]
 #     The log file name for the virtualhost.
-#     Optional. Defaults to false.
+#     Optional. Defaults to undef.
 #
 #   [*access_log_format*]
 #     The log format for the virtualhost.
-#     Optional. Defaults to false.
+#     Optional. Defaults to undef.
 #
 #   [*error_log_file*]
 #     The error log file name for the virtualhost.
@@ -126,9 +126,9 @@ define heat::wsgi::apache (
   $ssl_crl                     = undef,
   $ssl_certs_dir               = undef,
   $threads                     = 1,
-  $priority                    = '10',
-  $access_log_file             = false,
-  $access_log_format           = false,
+  $priority                    = 10,
+  $access_log_file             = undef,
+  $access_log_format           = undef,
   $error_log_file              = undef,
   $custom_wsgi_process_options = {},
   $wsgi_process_display_name   = undef,

manifests/wsgi/apache_api.pp

@@ -45,7 +45,7 @@
 #
 #   [*priority*]
 #     (optional) The priority for the vhost.
-#     Defaults to '10'
+#     Defaults to 10
 #
 #   [*threads*]
 #     (optional) The number of threads for the vhost.
@@ -63,11 +63,11 @@
 #
 #   [*access_log_file*]
 #     The log file name for the virtualhost.
-#     Optional. Defaults to false.
+#     Optional. Defaults to undef.
 #
 #   [*access_log_format*]
 #     The log format for the virtualhost.
-#     Optional. Defaults to false.
+#     Optional. Defaults to undef.
 #
 #   [*error_log_file*]
 #     The error log file name for the virtualhost.
@@ -122,9 +122,9 @@ class heat::wsgi::apache_api (
   $ssl_crl                     = undef,
   $ssl_certs_dir               = undef,
   $threads                     = 1,
-  $priority                    = '10',
-  $access_log_file             = false,
-  $access_log_format           = false,
+  $priority                    = 10,
+  $access_log_file             = undef,
+  $access_log_format           = undef,
   $error_log_file              = undef,
   $custom_wsgi_process_options = {},
   $wsgi_process_display_name   = undef,

manifests/wsgi/apache_api_cfn.pp

@@ -45,7 +45,7 @@
 #
 #   [*priority*]
 #     (optional) The priority for the vhost.
-#     Defaults to '10'
+#     Defaults to 10
 #
 #   [*threads*]
 #     (optional) The number of threads for the vhost.
@@ -63,11 +63,11 @@
 #
 #   [*access_log_file*]
 #     The log file name for the virtualhost.
-#     Optional. Defaults to false.
+#     Optional. Defaults to undef.
 #
 #   [*access_log_format*]
 #     The log format for the virtualhost.
-#     Optional. Defaults to false.
+#     Optional. Defaults to undef.
 #
 #   [*error_log_file*]
 #     The error log file name for the virtualhost.
@@ -123,9 +123,9 @@ class heat::wsgi::apache_api_cfn (
   $ssl_crl                     = undef,
   $ssl_certs_dir               = undef,
   $threads                     = 1,
-  $priority                    = '10',
-  $access_log_file             = false,
-  $access_log_format           = false,
+  $priority                    = 10,
+  $access_log_file             = undef,
+  $access_log_format           = undef,
   $error_log_file              = undef,
   $custom_wsgi_process_options = {},
   $wsgi_process_display_name   = undef,

spec/classes/heat_wsgi_apache_api_cfn_spec.rb

@@ -25,8 +25,8 @@ describe 'heat::wsgi::apache_api_cfn' do
         :headers                     => nil,
         :request_headers             => ['set Content-Type "application/json"'],
         :custom_wsgi_process_options => {},
-        :access_log_file             => false,
-        :access_log_format           => false,
+        :access_log_file             => nil,
+        :access_log_format           => nil,
       )}
     end
   end

spec/classes/heat_wsgi_apache_api_spec.rb

@@ -25,8 +25,8 @@ describe 'heat::wsgi::apache_api' do
         :headers                     => nil,
         :request_headers             => nil,
         :custom_wsgi_process_options => {},
-        :access_log_file             => false,
-        :access_log_format           => false,
+        :access_log_file             => nil,
+        :access_log_format           => nil,
       )}
     end
   end