diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index e047f668..d04d0407 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -166,6 +166,10 @@ # (Optional) Headers for the vhost. # Defaults to undef # +# [*request_headers*] +# (Optional) Modifies collected request headers in various ways. +# Defaults to undef +# # [*aliases*] # (Optional) Aliases for the vhost. # Defaults to undef @@ -262,6 +266,7 @@ define openstacklib::wsgi::apache ( $wsgi_import_script = undef, $wsgi_import_script_options = undef, $headers = undef, + $request_headers = undef, $aliases = undef, $custom_wsgi_process_options = {}, $custom_wsgi_script_aliases = undef, @@ -373,6 +378,7 @@ define openstacklib::wsgi::apache ( wsgi_import_script => $wsgi_import_script_real, wsgi_import_script_options => $wsgi_import_script_options_real, headers => $headers, + request_headers => $request_headers, aliases => $aliases, custom_fragment => $vhost_custom_fragment, allow_encoded_slashes => $allow_encoded_slashes, diff --git a/releasenotes/notes/apache-request_headers-1db72ccfd1e76735.yaml b/releasenotes/notes/apache-request_headers-1db72ccfd1e76735.yaml new file mode 100644 index 00000000..883493ed --- /dev/null +++ b/releasenotes/notes/apache-request_headers-1db72ccfd1e76735.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``openstacklib::wsgi::apache::request_headers`` parameter has been + added. diff --git a/spec/defines/openstacklib_wsgi_apache_spec.rb b/spec/defines/openstacklib_wsgi_apache_spec.rb index 504cbf59..5b79a53e 100644 --- a/spec/defines/openstacklib_wsgi_apache_spec.rb +++ b/spec/defines/openstacklib_wsgi_apache_spec.rb @@ -90,6 +90,7 @@ describe 'openstacklib::wsgi::apache' do :wsgi_script_aliases => { '/' => "/var/www/cgi-bin/keystone/main" }, :wsgi_application_group => '%{GLOBAL}', :headers => nil, + :request_headers => nil, :aliases => nil, :setenvif => ['X-Forwarded-Proto https HTTPS=1'], :access_log_file => false, @@ -115,6 +116,7 @@ describe 'openstacklib::wsgi::apache' do :wsgi_chunked_request => 'On', :custom_wsgi_script_aliases => { '/admin' => '/var/www/cgi-bin/keystone/admin' }, :headers => 'set X-Frame-Options "DENY"', + :request_headers => 'set Content-Type "application/json"', :aliases => [ { 'alias' => '/robots.txt', 'path' => '/etc/keystone/robots.txt', }, ], @@ -160,6 +162,7 @@ describe 'openstacklib::wsgi::apache' do :wsgi_pass_authorization => 'On', :wsgi_chunked_request => 'On', :headers => 'set X-Frame-Options "DENY"', + :request_headers => 'set Content-Type "application/json"', :aliases => [ { 'alias' => '/robots.txt', 'path' => '/etc/keystone/robots.txt', } ],