From 11d033131e4cedfb42967730e2a761f0aaa75886 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Tue, 7 Apr 2015 14:14:12 -0700
Subject: [PATCH] Correct wsgi_daemon_process_options key

'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
---
 manifests/wsgi/apache.pp                      |  2 +-
 spec/defines/openstacklib_wsgi_apache_spec.rb | 28 +++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp
index 9baf1cb4..06eaef6e 100644
--- a/manifests/wsgi/apache.pp
+++ b/manifests/wsgi/apache.pp
@@ -170,7 +170,7 @@ define openstacklib::wsgi::apache (
   }
 
   $wsgi_daemon_process_options = {
-    owner     => $user,
+    user      => $user,
     group     => $group,
     processes => $workers,
     threads   => $threads,
diff --git a/spec/defines/openstacklib_wsgi_apache_spec.rb b/spec/defines/openstacklib_wsgi_apache_spec.rb
index 3fc529d0..15bd3f0b 100644
--- a/spec/defines/openstacklib_wsgi_apache_spec.rb
+++ b/spec/defines/openstacklib_wsgi_apache_spec.rb
@@ -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