Update cluster_hosts.yml for cloud providers

- Add g_infra_hosts (nodes with sub-type infra)
- Add g_compute_hosts (nodes with sub-type compute)
- Reduce duplication by re-using previously defined variables

1 files changed, 11 insertions, 16 deletions

diff --git a/playbooks/gce/openshift-cluster/cluster_hosts.yml b/playbooks/gce/openshift-cluster/cluster_hosts.yml
index 2bfcedfc9..15690e3bf 100644
--- a/playbooks/gce/openshift-cluster/cluster_hosts.yml
+++ b/playbooks/gce/openshift-cluster/cluster_hosts.yml
@@ -1,22 +1,17 @@
 ---
-g_etcd_hosts:   "{{ (groups['tag_host-type-etcd']|default([]))
-                     | intersect((groups['tag_clusterid-' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}"
+g_all_hosts:     "{{ groups['tag_clusterid-' ~ cluster_id] | default([])
+                    | intersect(groups['tag_environment-' ~ cluster_env] | default([])) }}"
 
-g_lb_hosts:     "{{ (groups['tag_host-type-lb']|default([]))
-                     | intersect((groups['tag_clusterid-' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}"
+g_etcd_hosts:    "{{ g_all_hosts | intersect(groups['tag_host-type-etcd'] | default([])) }}"
 
-g_master_hosts: "{{ (groups['tag_host-type-master']|default([]))
-                     | intersect((groups['tag_clusterid-' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}"
+g_lb_hosts:      "{{ g_all_hosts | intersect(groups['tag_host-type-lb'] | default([])) }}"
 
-g_node_hosts:   "{{ (groups['tag_host-type-node']|default([]))
-                     | intersect((groups['tag_clusterid-' ~ cluster_id]|default([])))
-                     | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}"
+g_nfs_hosts:     "{{ g_all_hosts | intersect(groups['tag_host-type-nfs'] | default([])) }}"
 
-g_nfs_hosts:    "{{ (groups['tag_host-type-nfs']|default([]))
-                   | intersect((groups['tag_environment-' ~ cluster_id]|default([]))) }}"
+g_master_hosts:  "{{ g_all_hosts | intersect(groups['tag_host-type-master'] | default([])) }}"
 
-g_all_hosts:    "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts)
-                    | union(g_lb_hosts) | default([]) }}"
+g_node_hosts:    "{{ g_all_hosts | intersect(groups['tag_host-type-node'] | default([])) }}"
+
+g_infra_hosts:   "{{ g_node_hosts | intersect(groups['tag_sub-host-type-infra']) | default([]) }}"
+
+g_compute_hosts: "{{ g_node_hosts | intersect(groups['tag_sub-host-type-compute']) | default([]) }}"