diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2015-12-18 14:01:34 -0500 |
---|---|---|
committer | Kenny Woodson <kwoodson@redhat.com> | 2016-01-04 11:00:20 -0500 |
commit | 67b3fff8257072095ebdebfdfe5c429efea3a8d8 (patch) | |
tree | 8a25b519e2171a7abd145ba19cf97b638cbcedb5 /playbooks/openstack/openshift-cluster/cluster_hosts.yml | |
parent | a21189c1f0611bff6935364c8c255a88060d882d (diff) | |
download | openshift-67b3fff8257072095ebdebfdfe5c429efea3a8d8.tar.gz openshift-67b3fff8257072095ebdebfdfe5c429efea3a8d8.tar.bz2 openshift-67b3fff8257072095ebdebfdfe5c429efea3a8d8.tar.xz openshift-67b3fff8257072095ebdebfdfe5c429efea3a8d8.zip |
Cleanup and fixes for cluster_id change
- Move debug_level into vars.yml and byo inventory
- change variables in cluster_hosts.yml to be g_* and update playbooks to use
those values directly instead of setting them indirectly
- added a new g_all_hosts entry in cluster_hosts to use in the update playbook
instead of unioning all host types within the playbook
- added a cluster_hosts.yml for the byo playbook
Diffstat (limited to 'playbooks/openstack/openshift-cluster/cluster_hosts.yml')
-rw-r--r-- | playbooks/openstack/openshift-cluster/cluster_hosts.yml | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/playbooks/openstack/openshift-cluster/cluster_hosts.yml b/playbooks/openstack/openshift-cluster/cluster_hosts.yml index 80c0e218f..15712bbde 100644 --- a/playbooks/openstack/openshift-cluster/cluster_hosts.yml +++ b/playbooks/openstack/openshift-cluster/cluster_hosts.yml @@ -1,20 +1,22 @@ --- -etcd_hosts: "{{ (groups['tag_host-type_etcd']|default([]) - | intersect((groups['tag_clusterid_' ~ cluster_id]|default([]))) - | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}" +g_etcd_hosts: "{{ (groups['tag_host-type_etcd']|default([])) + | intersect((groups['tag_clusterid_' ~ cluster_id]|default([]))) + | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}" -lb_hosts: "{{ (groups['tag_host-type_lb']|default([])) - | intersect((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([]))) }}" -master_hosts: "{{ (groups['tag_host-type_master']|default([])) - | intersect((groups['tag_clusterid_' ~ cluster_id]|default([]))) - | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}" +g_master_hosts: "{{ (groups['tag_host-type_master']|default([])) + | intersect((groups['tag_clusterid_' ~ cluster_id]|default([]))) + | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}" -node_hosts: "{{ (groups['tag_host-type_node']|default([])) +g_node_hosts: "{{ (groups['tag_host-type_node']|default([])) | intersect((groups['tag_clusterid_' ~ cluster_id]|default([]))) | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}" -nfs_hosts: "{{ (groups['tag_host-type_nfs']|default([])) +g_nfs_hosts: "{{ (groups['tag_host-type_nfs']|default([])) | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}" +g_all_hosts: "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts) + | union(g_lb_hosts) | default([]) }}" |