From e285b5ff760ac7fb48ec4c4f6603de703c3e18a6 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Wed, 1 Apr 2015 14:48:27 +0000
Subject: 18 patch comments

---
 .../systemd/system/openstack-horizon-setup.service |  1 +
 openstack/usr/share/openstack/horizon.yml          | 34 ++++++++++++++++++----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/openstack/etc/systemd/system/openstack-horizon-setup.service b/openstack/etc/systemd/system/openstack-horizon-setup.service
index 9805a38f..9ec3197a 100644
--- a/openstack/etc/systemd/system/openstack-horizon-setup.service
+++ b/openstack/etc/systemd/system/openstack-horizon-setup.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Run horizon-setup Ansible scripts
 After=local-fs.target
+Before=apache-httpd.service
 
 [Service]
 ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/horizon.yml
diff --git a/openstack/usr/share/openstack/horizon.yml b/openstack/usr/share/openstack/horizon.yml
index b6113b6b..14cea5c5 100644
--- a/openstack/usr/share/openstack/horizon.yml
+++ b/openstack/usr/share/openstack/horizon.yml
@@ -4,22 +4,44 @@
 
 # Setup apache, this may end up in apache.yml
   - name: Create the apache user.
-    user: name=apache comment="Apache Server" shell=/sbin/nologin home=/var/www
+    user:
+        name: apache
+        comment: Apache Server
+        shell: /sbin/nologin
+        home: /var/www
 
-  - file: path=/usr/sbin/suexec group=apache mode=4750
+  - file:
+        path: /usr/sbin/suexec
+        group: apache
+        mode: 4750
 
 # Setup horizon
   - name: Create the horizon user.
-    user: name=horizon comment="Openstack Horizon User" shell=/sbin/nologin home=/var/lib/horizon
+    user:
+        name: horizon
+        comment: Openstack Horizon User
+        shell: /sbin/nologin
+        home: /var/lib/horizon
 
   - name: Create the /var folders for horizon
-    file: path={{ item }} state=directory owner=horizon group=horizon
+    file:
+        path: "{{ item }}"
+        state: directory
+        owner: horizon
+        group: horizon
     with_items:
     - /var/lib/horizon
 
-  - file: src=/etc/horizon/apache-horizon.conf dest=/etc/httpd/conf.d/apache-horizon.conf state=link
+  - name: Link horizon apache configuration
+    file:
+        src: /etc/horizon/apache-horizon.conf
+        dest: /etc/httpd/conf.d/apache-horizon.conf
+        state: link
 
   - name: Enable and start apache services needed by horizon
-    service: name={{ item }} enabled=yes state=started
+    service:
+        name: "{{ item }}"
+        enabled: yes
+        state: started
     with_items:
     - apache-httpd.service
-- 
cgit v1.2.1