diff --git a/manifests/wsgi/apache_api.pp b/manifests/wsgi/apache_api.pp index 411f0101b..1c9c8abb6 100644 --- a/manifests/wsgi/apache_api.pp +++ b/manifests/wsgi/apache_api.pp @@ -52,10 +52,6 @@ # (Optional) The priority for the vhost. # Defaults to 10 # -# [*setenv*] -# (Optional) Set environment variables for the vhost. -# Defaults to [] -# # [*threads*] # (Optional) The number of threads for the vhost. # Defaults to 1 @@ -152,7 +148,6 @@ class nova::wsgi::apache_api ( $wsgi_process_display_name = undef, $threads = 1, $priority = 10, - $setenv = [], $access_log_file = undef, $access_log_pipe = undef, $access_log_syslog = undef, @@ -178,7 +173,6 @@ class nova::wsgi::apache_api ( group => $::nova::params::group, path => $path, priority => $priority, - setenv => $setenv, servername => $servername, ssl => $ssl, ssl_ca => $ssl_ca, diff --git a/manifests/wsgi/apache_metadata.pp b/manifests/wsgi/apache_metadata.pp index 8478decfa..80cc6fb86 100644 --- a/manifests/wsgi/apache_metadata.pp +++ b/manifests/wsgi/apache_metadata.pp @@ -56,10 +56,6 @@ # (Optional) The priority for the vhost. # Defaults to 10 # -# [*setenv*] -# (Optional) Set environment variables for the vhost. -# Defaults to [] -# # [*threads*] # (Optional) The number of threads for the vhost. # Defaults to 1 @@ -156,7 +152,6 @@ class nova::wsgi::apache_metadata ( $wsgi_process_display_name = undef, $threads = 1, $priority = 10, - $setenv = [], $ensure_package = 'present', $access_log_file = undef, $access_log_pipe = undef, @@ -191,7 +186,6 @@ class nova::wsgi::apache_metadata ( group => $::nova::params::group, path => $path, priority => $priority, - setenv => $setenv, servername => $servername, ssl => $ssl, ssl_ca => $ssl_ca, diff --git a/releasenotes/notes/wsgi-apache-setenv-61b03a6a3b894526.yaml b/releasenotes/notes/wsgi-apache-setenv-61b03a6a3b894526.yaml deleted file mode 100644 index 8ca91da85..000000000 --- a/releasenotes/notes/wsgi-apache-setenv-61b03a6a3b894526.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -features: - - | - The following classes now supports the new ``setenv`` parameter - - - ``nova::wsgi::apache_api`` - - ``nova::wsgi::apache_metadata`` diff --git a/spec/classes/nova_wsgi_apache_api_spec.rb b/spec/classes/nova_wsgi_apache_api_spec.rb index 6752bca92..143109774 100644 --- a/spec/classes/nova_wsgi_apache_api_spec.rb +++ b/spec/classes/nova_wsgi_apache_api_spec.rb @@ -19,7 +19,6 @@ describe 'nova::wsgi::apache_api' do :group => 'nova', :path => '/', :priority => 10, - :setenv => [], :servername => 'foo.example.com', :ssl => false, :threads => 1, diff --git a/spec/classes/nova_wsgi_apache_metadata_spec.rb b/spec/classes/nova_wsgi_apache_metadata_spec.rb index b79a5ec3b..9ada6953a 100644 --- a/spec/classes/nova_wsgi_apache_metadata_spec.rb +++ b/spec/classes/nova_wsgi_apache_metadata_spec.rb @@ -17,7 +17,6 @@ describe 'nova::wsgi::apache_metadata' do :group => 'nova', :path => '/', :priority => 10, - :setenv => [], :servername => 'foo.example.com', :ssl => false, :threads => 1,