GlusterFS: Ignore external nodes

Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>

playbooks/init/vars/cluster_hosts.yml

@@ -22,5 +22,4 @@ g_glusterfs_registry_hosts: "{{ groups.glusterfs_registry | default(g_glusterfs_
 g_all_hosts: "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts)
                  | union(g_new_etcd_hosts) | union(g_lb_hosts) | union(g_nfs_hosts)
                  | union(g_new_node_hosts)| union(g_new_master_hosts)
-                 | union(g_glusterfs_hosts) | union(g_glusterfs_registry_hosts)
                  | default([]) }}"

playbooks/openshift-glusterfs/config.yml

@@ -1,10 +1,10 @@
 ---
 - import_playbook: ../init/main.yml
   vars:
-    l_init_fact_hosts: "oo_masters_to_config:oo_glusterfs_to_config"
+    l_init_fact_hosts: "oo_masters_to_config:oo_nodes_to_config:oo_glusterfs_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] | union(groups['oo_glusterfs_to_config']) }}"
     l_install_base_packages: True
-    l_base_packages_hosts: "oo_glusterfs_to_config"
+    l_base_packages_hosts: "oo_nodes_to_configi:&oo_glusterfs_to_config"
 
 - import_playbook: private/config.yml

roles/openshift_storage_glusterfs/templates/heketi-endpoints.yml.j2

@@ -9,7 +9,7 @@ metadata:
 subsets:
 - addresses:
 {% for node in glusterfs_nodes %}
-  - ip: {{ hostvars[node].glusterfs_ip | default(hostvars[node].openshift.common.ip) }}
+  - ip: {{ hostvars[node].glusterfs_ip | default(hostvars[node].openshift.common.ip if "openshift" in hostvars[node] else "") }}
 {% endfor %}
   ports:
   - port: 1