openstack
/
puppet-octavia
Code Issues Proposed changes

Allow wsgi script to be configurable 

This is intended to be analogous to 1c7c146c917c5dbf51db378f8392cc328fe4632b and fa753eafe840ad1582e48442a975629e8694a058 for puppet-aodh.

Change-Id: I4ab78052d276dfb3c52cd13586065037e9b4a38f
This commit is contained in:
Timothy Rice 2022-02-03 13:33:07 +11:00 committed by Takashi Kajinami
parent 8f09984e5c
commit be9130696f
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/wsgi/apache.pp
View File

@ -87,8 +87,16 @@
# { python-path => '/my/python/virtualenv' }
# Defaults to {}
#
# [*wsgi_script_dir*]
# (Optional) The directory to install the WSGI script for apache to read.
# Defaults to $::octavia::params::octavia_wsgi_script_dir
#
# [*wsgi_script_source*]
# (Optional) The location of the octavia WSGI script.
# Defaults to $::octavia::params::octavia_wsgi_script_source
#
# [*vhost_custom_fragment*]
# (optional) Passes a string of custom configuration
# (Optional) Passes a string of custom configuration.
# directives to be placed at the end of the vhost configuration.
# Defaults to undef.
#
@ -118,11 +126,12 @@ class octavia::wsgi::apache (
$access_log_format = false,
$error_log_file = undef,
$custom_wsgi_process_options = {},
$wsgi_script_dir = $::octavia::params::octavia_wsgi_script_path,
$wsgi_script_source = $::octavia::params::octavia_wsgi_script_source,
$vhost_custom_fragment = undef,
) {
) inherits octavia::params {
include octavia::deps
include octavia::params
Anchor['octavia::install::end'] -> Class['apache']
@ -148,9 +157,9 @@ class octavia::wsgi::apache (
wsgi_daemon_process => 'octavia',
wsgi_process_display_name => $wsgi_process_display_name,
wsgi_process_group => 'octavia',
wsgi_script_dir => $::octavia::params::octavia_wsgi_script_path,
wsgi_script_dir => $wsgi_script_dir,
wsgi_script_file => 'app',
wsgi_script_source => $::octavia::params::octavia_wsgi_script_source,
wsgi_script_source => $wsgi_script_source,
access_log_file => $access_log_file,
access_log_format => $access_log_format,
error_log_file => $error_log_file,

6
releasenotes/notes/add-wsgi-script-args-1129563527a3e618.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
It is now possible to specify `octavia::wsgi::apache::wsgi_script_dir`
and `octavia::wsgi::apache::wsgi_script_source` to override operating
system defaults.

4
spec/classes/octavia_wsgi_apache_spec.rb
View File

@ -40,6 +40,8 @@ describe 'octavia::wsgi::apache' do
:access_log_file => '/var/log/httpd/access_log',
:access_log_format => 'some format',
:error_log_file => '/var/log/httpd/error_log',
:wsgi_script_dir => '/var/lib/openstack/cgi-bin/octavia',
:wsgi_script_source => '/my/path/app.wsgi',
:vhost_custom_fragment => 'Timeout 99'
}
end
@ -58,7 +60,9 @@ describe 'octavia::wsgi::apache' do
:wsgi_daemon_process => 'octavia',
:wsgi_process_display_name => 'octavia',
:wsgi_process_group => 'octavia',
:wsgi_script_dir => '/var/lib/openstack/cgi-bin/octavia',
:wsgi_script_file => 'app',
:wsgi_script_source => '/my/path/app.wsgi',
:custom_wsgi_process_options => {
'python_path' => '/my/python/path',
},