openstack/puppet-openstacklib
Code Issues Proposed changes

Correct wsgi_daemon_process_options key

Browse Source 
'owner' is not a valid option for the WSGIDaemonProcess directive. The
correct option is 'user' [1]. Trying to set 'owner' causes the service
to be unable to start. This patch corrects that option name.

[1] https://code.google.com/p/modwsgi/wiki/ConfigurationDirectives#WSGIDaemonProcess

Change-Id: I907fbcb48db823ea8f5caca4496efaaa456ef69c
This commit is contained in:
Colleen Murphy
2015-04-07 14:14:12 -07:00
parent 331b89a4d9
commit 11d033131e
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/wsgi/apache.pp
View File

@@ -170,7 +170,7 @@ define openstacklib::wsgi::apache (
}
$wsgi_daemon_process_options = {
owner => $user,
user => $user,
group => $group,
processes => $workers,
threads => $threads,

28
spec/defines/openstacklib_wsgi_apache_spec.rb
View File

@@ -65,17 +65,23 @@ describe 'openstacklib::wsgi::apache' do
)}
it { is_expected.to contain_apache__vhost('keystone_wsgi').with(
'servername' => 'some.host.tld',
'ip' => nil,
'port' => '5000',
'docroot' => '/var/www/cgi-bin/keystone',
'docroot_owner' => 'keystone',
'docroot_group' => 'keystone',
'ssl' => 'true',
'wsgi_daemon_process' => 'keystone_wsgi',
'wsgi_process_group' => 'keystone_wsgi',
'wsgi_script_aliases' => { '/' => "/var/www/cgi-bin/keystone/main" },
'require' => 'File[keystone_wsgi]'
'servername' => 'some.host.tld',
'ip' => nil,
'port' => '5000',
'docroot' => '/var/www/cgi-bin/keystone',
'docroot_owner' => 'keystone',
'docroot_group' => 'keystone',
'ssl' => 'true',
'wsgi_daemon_process' => 'keystone_wsgi',
'wsgi_process_group' => 'keystone_wsgi',
'wsgi_script_aliases' => { '/' => "/var/www/cgi-bin/keystone/main" },
'wsgi_daemon_process_options' => {
'user' => 'keystone',
'group' => 'keystone',
'processes' => 1,
'threads' => global_facts[:processorcount],
},
'require' => 'File[keystone_wsgi]'
)}
it { is_expected.to contain_file("#{platform_parameters[:httpd_ports_file]}") }
end