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 %}