From e67a52d1b65f27aea6142fd2a878906c92fcc9c8 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Mon, 23 Oct 2017 15:31:31 +0000
Subject: [PATCH] Try to move the odcs gluster brick to the backend only.

---
 playbooks/groups/odcs.yml                 |  4 ++--
 roles/gluster/consolidated/tasks/main.yml | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml
index 15504a1fd0..89b518a233 100644
--- a/playbooks/groups/odcs.yml
+++ b/playbooks/groups/odcs.yml
@@ -61,14 +61,14 @@
     gluster_brick_dir: /srv/glusterfs/
     gluster_mount_dir: /srv/odcs
     gluster_brick_name: odcs
-    gluster_server_group: odcs-stg
+    gluster_server_group: odcs-backend-stg
     tags: gluster
     when: env == 'staging'
   - role: gluster/consolidated
     gluster_brick_dir: /srv/glusterfs/
     gluster_mount_dir: /srv/odcs
     gluster_brick_name: odcs
-    gluster_server_group: odcs
+    gluster_server_group: odcs-backend
     tags: gluster
     when: env != 'staging'
 
diff --git a/roles/gluster/consolidated/tasks/main.yml b/roles/gluster/consolidated/tasks/main.yml
index 318029503a..75cb2f759b 100644
--- a/roles/gluster/consolidated/tasks/main.yml
+++ b/roles/gluster/consolidated/tasks/main.yml
@@ -2,11 +2,13 @@
   package: name={{ item }} state=present
   with_items:
   - glusterfs-server
+  when: inventory_hostname in groups[gluster_server_group]
   tags:
   - packages
 
 - name: start glusterd for the server
   service: name=glusterd state=started enabled=true
+  when: inventory_hostname in groups[gluster_server_group]
 
 - name: Servers discover each other.
   command: gluster peer probe  {{ item }}
@@ -32,11 +34,16 @@
   tags:
   - gluster
 
-- name: Ensure Gluster brick and mount directories exist.
-  file: "path={{ item }} state=directory mode=0775"
-  with_items:
-    - "{{ gluster_brick_dir }}"
-    - "{{ gluster_mount_dir }}"
+- name: Ensure Gluster brick directories exist.
+  file: "path={{ gluster_brick_dir }} state=directory mode=0775"
+  when: inventory_hostname in groups[gluster_server_group]
+  tags:
+  - gluster
+
+- name: Ensure Gluster mount directories exist.
+  file: "path={{ gluster_mount_dir }} state=directory mode=0775"
+  tags:
+  - gluster
 
 - name: Configure Gluster volume.
   gluster_volume:
@@ -47,6 +54,7 @@
     cluster: "{{ groups[gluster_server_group] | join(',') }}"
     host: "{{ inventory_hostname }}"
     force: yes
+  when: inventory_hostname in groups[gluster_server_group]
   run_once: true
   ignore_errors: true