From 64ecf0e3d6e3b3af6a6939242cc97d18ef11b9a8 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Wed, 26 Feb 2014 09:10:22 +0100
Subject: [PATCH] Distinguish the stg and prod gluster volumes for nuancier

---
 playbooks/groups/nuancier.yml | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml
index c9253f6423..8d51085fce 100644
--- a/playbooks/groups/nuancier.yml
+++ b/playbooks/groups/nuancier.yml
@@ -8,7 +8,7 @@
   user: root
   gather_facts: False
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "{{ private }}/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -26,7 +26,7 @@
   gather_facts: True
   accelerate: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "{{ private }}/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -58,7 +58,7 @@
   gather_facts: True
   accelerate: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "{{ private }}/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
@@ -75,11 +75,31 @@
   gather_facts: True
   accelerate: True
 
-  vars_files: 
+  vars_files:
    - /srv/web/infra/ansible/vars/global.yml
    - "{{ private }}/vars.yml"
    - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
+  roles:
+  - role: gluster/server
+    name: gluster
+    username: "{{ nuancier_gluster_username }}"
+    password: "{{ nuancier_gluster_password }}"
+    owner: root
+    group: root
+    datadir: /srv/glusterfs/nuancier-stg
+
+  - role: gluster/client
+    name: gluster
+    servers:
+    - nuancier01.stg.phx2.fedoraproject.org
+    - nuancier02.stg.phx2.fedoraproject.org
+    username: "{{ nuancier_gluster_username }}"
+    password: "{{ nuancier_gluster_password }}"
+    owner: apache
+    group: root
+    mountdir: /var/cache/nuancier
+
   roles:
   - role: gluster/server
     name: gluster
@@ -91,9 +111,7 @@
 
   - role: gluster/client
     name: gluster
-    servers: 
-    - nuancier01.stg.phx2.fedoraproject.org
-    - nuancier02.stg.phx2.fedoraproject.org
+    servers:
     - nuancier01.phx2.fedoraproject.org
     - nuancier02.phx2.fedoraproject.org
     username: "{{ nuancier_gluster_username }}"