From 87358befc0ab9ce225b5607c6069ad0973e53482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Fri, 11 Jan 2019 08:22:37 +0100
Subject: [PATCH] Fix deployment of gluster with openshift AllInOne

When TripleO deploys openshift with CNS, it configures it to setup
gluster for both the worker nodes and the image registry. However, the
code was incorrectly adding the glusterfs_registry group only for the
Infra node and was forgetting about the AllInOne role.

Closes-Bug: #1811334
Change-Id: Ib502a28db4d67434686a058562a37d1e1df3e263
---
 extraconfig/services/openshift-cns.yaml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/extraconfig/services/openshift-cns.yaml b/extraconfig/services/openshift-cns.yaml
index 4c96dd6ec5..1660dbfafe 100644
--- a/extraconfig/services/openshift-cns.yaml
+++ b/extraconfig/services/openshift-cns.yaml
@@ -148,11 +148,8 @@ outputs:
               copy:
                 dest: "{{playbook_dir}}/openshift/inventory/{{tripleo_role_name}}_openshift_glusterfs.yml"
                 content: |
-                  {% if tripleo_node_group_name == "node-config-infra" -%}
+                  {% if tripleo_node_group_name == "node-config-infra" or tripleo_node_group_name == 'node-config-all-in-one' -%}
                   glusterfs_registry:
-                  {% else -%}
-                  glusterfs:
-                  {% endif %}
                     hosts:
                       {% for host in groups[tripleo_role_name] | default([]) -%}
                       {{ hostvars.raw_get(host)['ansible_hostname'] }}:
@@ -160,3 +157,14 @@ outputs:
                         glusterfs_devices:
                           {{openshift_gluster_disks | to_nice_yaml() | indent(8) }}
                       {% endfor %}
+                  {% endif %}
+                  {% if tripleo_node_group_name != "node-config-infra" or tripleo_node_group_name == 'node-config-all-in-one'-%}
+                  glusterfs:
+                    hosts:
+                      {% for host in groups[tripleo_role_name] | default([]) -%}
+                      {{ hostvars.raw_get(host)['ansible_hostname'] }}:
+                        glusterfs_ip: {{hostvars.raw_get(host)['storage_ip']}}
+                        glusterfs_devices:
+                          {{openshift_gluster_disks | to_nice_yaml() | indent(8) }}
+                      {% endfor %}
+                  {% endif %}