From b8f61638f0ac909c56f7cb6cd0ea921d236cf006 Mon Sep 17 00:00:00 2001
From: root <root@533800-node11.ukospoc.com>
Date: Mon, 25 Jan 2016 00:24:48 +0000
Subject: [PATCH] Adding support for mod_wsgi

---
 tasks/ironic_api_post_install.yml | 8 ++++----
 tasks/ironic_pre_install.yml      | 2 ++
 templates/ironic-httpd.conf.j2    | 2 +-
 templates/ironic-wsgi.py.j2       | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tasks/ironic_api_post_install.yml b/tasks/ironic_api_post_install.yml
index 551a99af..4dd1d092 100644
--- a/tasks/ironic_api_post_install.yml
+++ b/tasks/ironic_api_post_install.yml
@@ -23,7 +23,7 @@
     - { src: "ironic-ports.conf.j2", dest: "/etc/apache2/ports.conf" }
     - { src: "ironic-httpd.conf.j2", dest: "/etc/apache2/sites-available/ironic-httpd.conf" }
   notify:
-    - Restart Apache
+    - Restart ironic services
   tags:
     - ironic-httpd
 
@@ -32,7 +32,7 @@
     path: "/etc/apache2/sites-enabled/000-default.conf"
     state: "absent"
   notify:
-    - Restart Apache
+    - Restart ironic services
   tags:
     - ironic-httpd
 
@@ -44,7 +44,7 @@
   with_items:
     - { src: "/etc/apache2/sites-available/ironic-httpd.conf", dest: "/etc/apache2/sites-enabled/ironic-httpd.conf", state: "link" }
   notify:
-    - Restart Apache
+    - Restart ironic services
   tags:
     - ironic-httpd
 
@@ -56,6 +56,6 @@
     group: "{{ ironic_system_group_name }}"
     mode: "0755"
   notify:
-    - Restart Apache
+    - Restart ironic services
   tags:
     - ironic-config
diff --git a/tasks/ironic_pre_install.yml b/tasks/ironic_pre_install.yml
index 7d7fcb3e..4d808a85 100644
--- a/tasks/ironic_pre_install.yml
+++ b/tasks/ironic_pre_install.yml
@@ -68,6 +68,8 @@
     - { path: "{{ ironic_system_home_folder }}/master_images" }
     - { path: "/var/lock/ironic" }
     - { path: "/var/run/ironic" }
+    - { path: "/var/www/cgi-bin", owner: root, group: root }
+    - { path: "/var/www/cgi-bin/ironic" }
   tags:
     - ironic-api
     - ironic-conductor
diff --git a/templates/ironic-httpd.conf.j2 b/templates/ironic-httpd.conf.j2
index c7057c5b..13a9e8ea 100644
--- a/templates/ironic-httpd.conf.j2
+++ b/templates/ironic-httpd.conf.j2
@@ -1,7 +1,7 @@
 # {{ ansible_managed }}
 
 <VirtualHost *:{{ ironic_service_port }}>
-    WSGIDaemonProcess ironic-api user={{ ironic_system_user_name }} group={{ ironic_group_name }} processes={{ ironic_wsgi_processes }} threads={{ ironic_wsgi_threads }} display-name=%{GROUP}
+    WSGIDaemonProcess ironic-api user={{ ironic_system_user_name }} group={{ ironic_system_group_name }} processes={{ ironic_wsgi_processes }} threads={{ ironic_wsgi_threads }} display-name=%{GROUP}
     WSGIScriptAlias / /var/www/cgi-bin/ironic/ironic.wsgi
     SetEnv APACHE_RUN_USER {{ ironic_system_user_name }}
     SetEnv APACHE_RUN_GROUP {{ ironic_system_group_name }}
diff --git a/templates/ironic-wsgi.py.j2 b/templates/ironic-wsgi.py.j2
index 7f07dbb8..64779a56 100644
--- a/templates/ironic-wsgi.py.j2
+++ b/templates/ironic-wsgi.py.j2
@@ -18,7 +18,7 @@
 
 import os
 
-{% if ironic_venv_enable | bool %}
+{% if ironic_venv_enabled | bool %}
 activate_this = os.path.expanduser("{{ ironic_venv_bin }}/activate_this.py")
 execfile(activate_this, dict(__file__=activate_this))
 {% endif %}