Merge "Add wsgi_chunked_request option"

manifests/wsgi/apache.pp

@@ -111,6 +111,10 @@
 #     directives to be placed at the end of the vhost configuration.
 #     Defaults to undef.
 #
+#   [*wsgi_chunked_request*]
+#     (optional) apache::vhost wsgi_chunked_request parameter.
+#     Defaults to undef
+#
 # == Dependencies
 #
 #   requires Class['apache'] & Class['keystone']
@@ -157,6 +161,7 @@ class keystone::wsgi::apache (
   $wsgi_script_source      = undef,
   $wsgi_application_group  = '%{GLOBAL}',
   $wsgi_pass_authorization = 'On',
+  $wsgi_chunked_request    = undef,
 
   $access_log_format     = false,
   $vhost_custom_fragment = undef,
@@ -282,6 +287,7 @@ class keystone::wsgi::apache (
     wsgi_application_group      => $wsgi_application_group,
     wsgi_pass_authorization     => $wsgi_pass_authorization,
     custom_fragment             => $vhost_custom_fragment,
+    wsgi_chunked_request        => $wsgi_chunked_request,
     require                     => File['keystone_wsgi_main'],
     access_log_format           => $access_log_format,
   }
@@ -311,6 +317,7 @@ class keystone::wsgi::apache (
       wsgi_application_group      => $wsgi_application_group,
       wsgi_pass_authorization     => $wsgi_pass_authorization,
       custom_fragment             => $vhost_custom_fragment,
+      wsgi_chunked_request        => $wsgi_chunked_request,
       require                     => File['keystone_wsgi_admin'],
       access_log_format           => $access_log_format,
     }

metadata.json

@@ -31,7 +31,7 @@
   ],
   "description": "Installs and configures OpenStack Keystone (Identity).",
   "dependencies": [
-    { "name": "puppetlabs/apache", "version_requirement": ">=1.0.0 <2.0.0" },
+    { "name": "puppetlabs/apache", "version_requirement": ">=1.2.0 <2.0.0" },
     { "name": "puppetlabs/inifile", "version_requirement": ">=1.0.0 <2.0.0" },
     { "name": "puppetlabs/stdlib", "version_requirement": ">=4.0.0 <5.0.0" },
     { "name": "openstack/openstacklib", "version_requirement": ">=7.0.0 <8.0.0" }

spec/classes/keystone_wsgi_apache_spec.rb

@@ -293,6 +293,21 @@ describe 'keystone::wsgi::apache' do
         'require' => ["File[#{platform_parameters[:wsgi_script_path]}]", "Package[keystone]"]
       )}
     end
+
+    describe 'when overriding parameters using wsgi chunked request' do
+      let :params do
+        {
+          :wsgi_chunked_request => 'On'
+        }
+      end
+
+      it { is_expected.to contain_apache__vhost('keystone_wsgi_admin').with(
+        'wsgi_chunked_request' => 'On'
+      )}
+      it { is_expected.to contain_apache__vhost('keystone_wsgi_main').with(
+        'wsgi_chunked_request' => 'On'
+      )}
+    end
   end
 
   context 'on RedHat platforms' do