openstack/puppet-nova
Code Issues Proposed changes

Merge "Revert "apache: Expose setenv""

Browse Source
This commit is contained in:
Zuul
2023-08-16 16:08:14 +00:00
committed by Gerrit Code Review
parent 5f213b86f0 3724ee989c
commit d103c36681
5 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/wsgi/apache_api.pp
View File

@@ -52,10 +52,6 @@
# (Optional) The priority for the vhost. # (Optional) The priority for the vhost.
# Defaults to 10 # Defaults to 10
# #
# [*setenv*]
# (Optional) Set environment variables for the vhost.
# Defaults to []
#
# [*threads*] # [*threads*]
# (Optional) The number of threads for the vhost. # (Optional) The number of threads for the vhost.
# Defaults to 1 # Defaults to 1
@@ -152,7 +148,6 @@ class nova::wsgi::apache_api (
$wsgi_process_display_name = undef, $wsgi_process_display_name = undef,
$threads = 1, $threads = 1,
$priority = 10, $priority = 10,
$setenv = [],
$access_log_file = undef, $access_log_file = undef,
$access_log_pipe = undef, $access_log_pipe = undef,
$access_log_syslog = undef, $access_log_syslog = undef,
@@ -178,7 +173,6 @@ class nova::wsgi::apache_api (
group => $::nova::params::group, group => $::nova::params::group,
path => $path, path => $path,
priority => $priority, priority => $priority,
setenv => $setenv,
servername => $servername, servername => $servername,
ssl => $ssl, ssl => $ssl,
ssl_ca => $ssl_ca, ssl_ca => $ssl_ca,

6
manifests/wsgi/apache_metadata.pp
View File

@@ -56,10 +56,6 @@
# (Optional) The priority for the vhost. # (Optional) The priority for the vhost.
# Defaults to 10 # Defaults to 10
# #
# [*setenv*]
# (Optional) Set environment variables for the vhost.
# Defaults to []
#
# [*threads*] # [*threads*]
# (Optional) The number of threads for the vhost. # (Optional) The number of threads for the vhost.
# Defaults to 1 # Defaults to 1
@@ -156,7 +152,6 @@ class nova::wsgi::apache_metadata (
$wsgi_process_display_name = undef, $wsgi_process_display_name = undef,
$threads = 1, $threads = 1,
$priority = 10, $priority = 10,
$setenv = [],
$ensure_package = 'present', $ensure_package = 'present',
$access_log_file = undef, $access_log_file = undef,
$access_log_pipe = undef, $access_log_pipe = undef,
@@ -191,7 +186,6 @@ class nova::wsgi::apache_metadata (
group => $::nova::params::group, group => $::nova::params::group,
path => $path, path => $path,
priority => $priority, priority => $priority,
setenv => $setenv,
servername => $servername, servername => $servername,
ssl => $ssl, ssl => $ssl,
ssl_ca => $ssl_ca, ssl_ca => $ssl_ca,

7
releasenotes/notes/wsgi-apache-setenv-61b03a6a3b894526.yaml
View File

@@ -1,7 +0,0 @@
---
features:
- |
The following classes now supports the new ``setenv`` parameter
- ``nova::wsgi::apache_api``
- ``nova::wsgi::apache_metadata``

1
spec/classes/nova_wsgi_apache_api_spec.rb
View File

@@ -19,7 +19,6 @@ describe 'nova::wsgi::apache_api' do
:group => 'nova', :group => 'nova',
:path => '/', :path => '/',
:priority => 10, :priority => 10,
:setenv => [],
:servername => 'foo.example.com', :servername => 'foo.example.com',
:ssl => false, :ssl => false,
:threads => 1, :threads => 1,

1
spec/classes/nova_wsgi_apache_metadata_spec.rb
View File

@@ -17,7 +17,6 @@ describe 'nova::wsgi::apache_metadata' do
:group => 'nova', :group => 'nova',
:path => '/', :path => '/',
:priority => 10, :priority => 10,
:setenv => [],
:servername => 'foo.example.com', :servername => 'foo.example.com',
:ssl => false, :ssl => false,
:threads => 1, :threads => 1,