openstack
/
puppet-nova
Code Issues Proposed changes

Expose vhost_custom_fragment 

It is provided by the Puppet class 'openstacklib::wsgi::apache'.
This change exposes it for the Nova API and metadata services.

Change-Id: Ifcc1f2c882f7b03ced18f48b54138792a41c3329
Signed-off-by: Luke Short <ekultails@gmail.com>
This commit is contained in:
Luke Short 2020-08-11 10:56:59 -04:00
parent f0cc31cecc
commit 7ef245ef7d
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/wsgi/apache_api.pp
View File

@ -90,6 +90,11 @@
# { python-path => '/my/python/virtualenv' } # { python-path => '/my/python/virtualenv' }
# Defaults to {} # Defaults to {}
# #
# [*vhost_custom_fragment*]
# (optional) Passes a string of custom configuration
# directives to be placed at the end of the vhost configuration.
# Defaults to undef.
#
# == Dependencies # == Dependencies
# #
# requires Class['apache'] & Class['nova'] & Class['nova::api'] # requires Class['apache'] & Class['nova'] & Class['nova::api']
@ -121,6 +126,7 @@ class nova::wsgi::apache_api (
$access_log_format = false, $access_log_format = false,
$error_log_file = undef, $error_log_file = undef,
$custom_wsgi_process_options = {}, $custom_wsgi_process_options = {},
$vhost_custom_fragment = undef,
) { ) {
include nova::params include nova::params
@ -151,6 +157,7 @@ class nova::wsgi::apache_api (
ssl_key => $ssl_key, ssl_key => $ssl_key,
threads => $threads, threads => $threads,
user => 'nova', user => 'nova',
vhost_custom_fragment => $vhost_custom_fragment,
workers => $workers, workers => $workers,
wsgi_daemon_process => 'nova-api', wsgi_daemon_process => 'nova-api',
wsgi_process_display_name => $wsgi_process_display_name, wsgi_process_display_name => $wsgi_process_display_name,

7
manifests/wsgi/apache_metadata.pp
View File

@ -76,6 +76,11 @@
# { python-path => '/my/python/virtualenv' } # { python-path => '/my/python/virtualenv' }
# Defaults to {} # Defaults to {}
# #
# [*vhost_custom_fragment*]
# (optional) Passes a string of custom configuration
# directives to be placed at the end of the vhost configuration.
# Defaults to undef.
#
# == Dependencies # == Dependencies
# #
# requires Class['apache'] & Class['nova'] & Class['nova::metadata'] # requires Class['apache'] & Class['nova'] & Class['nova::metadata']
@ -108,6 +113,7 @@ class nova::wsgi::apache_metadata (
$access_log_format = false, $access_log_format = false,
$error_log_file = undef, $error_log_file = undef,
$custom_wsgi_process_options = {}, $custom_wsgi_process_options = {},
$vhost_custom_fragment = undef,
) { ) {
include nova::params include nova::params
@ -146,6 +152,7 @@ class nova::wsgi::apache_metadata (
ssl_key => $ssl_key, ssl_key => $ssl_key,
threads => $threads, threads => $threads,
user => 'nova', user => 'nova',
vhost_custom_fragment => $vhost_custom_fragment,
workers => $workers, workers => $workers,
wsgi_daemon_process => 'nova-metadata', wsgi_daemon_process => 'nova-metadata',
wsgi_process_display_name => $wsgi_process_display_name, wsgi_process_display_name => $wsgi_process_display_name,

2
spec/classes/nova_wsgi_apache_api_spec.rb
View File

@ -55,6 +55,7 @@ describe 'nova::wsgi::apache_api' do
:bind_host => '10.42.51.1', :bind_host => '10.42.51.1',
:api_port => 12345, :api_port => 12345,
:ssl => false, :ssl => false,
:vhost_custom_fragment => 'Timeout 99',
:wsgi_process_display_name => 'nova-api', :wsgi_process_display_name => 'nova-api',
:workers => 37, :workers => 37,
:custom_wsgi_process_options => { :custom_wsgi_process_options => {
@ -79,6 +80,7 @@ describe 'nova::wsgi::apache_api' do
:ssl => false, :ssl => false,
:threads => 1, :threads => 1,
:user => 'nova', :user => 'nova',
:vhost_custom_fragment => 'Timeout 99',
:workers => 37, :workers => 37,
:wsgi_daemon_process => 'nova-api', :wsgi_daemon_process => 'nova-api',
:wsgi_process_display_name => 'nova-api', :wsgi_process_display_name => 'nova-api',