diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-12-18 14:35:35 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2016-01-04 11:19:41 -0500 |
| commit | da8165469a43dc3bf43b2024a76edcd04be0bb81 (patch) | |
| tree | 3ba4b2f8eeb1919c0fd98041dfb541a477743844 | |
| parent | 67b3fff8257072095ebdebfdfe5c429efea3a8d8 (diff) | |
| download | openshift-da8165469a43dc3bf43b2024a76edcd04be0bb81.tar.gz openshift-da8165469a43dc3bf43b2024a76edcd04be0bb81.tar.bz2 openshift-da8165469a43dc3bf43b2024a76edcd04be0bb81.tar.xz openshift-da8165469a43dc3bf43b2024a76edcd04be0bb81.zip | |
Fix error in byo cluster_hosts.yml
5 files changed, 10 insertions, 5 deletions
diff --git a/playbooks/aws/openshift-cluster/cluster_hosts.yml b/playbooks/aws/openshift-cluster/cluster_hosts.yml index 455b43510..d6b413c6f 100644 --- a/playbooks/aws/openshift-cluster/cluster_hosts.yml +++ b/playbooks/aws/openshift-cluster/cluster_hosts.yml @@ -16,7 +16,7 @@ g_node_hosts: "{{ (groups['tag_host-type_node']|default([])) | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}" g_nfs_hosts: "{{ (groups['tag_host-type_nfs']|default([])) - | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}" + | intersect((groups['tag_environment_' ~ cluster_id]|default([]))) }}" g_all_hosts: "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts) | union(g_lb_hosts) | default([]) }}" diff --git a/playbooks/byo/openshift-cluster/cluster_hosts.yml b/playbooks/byo/openshift-cluster/cluster_hosts.yml index 1b2b7bff0..e093b2580 100644 --- a/playbooks/byo/openshift-cluster/cluster_hosts.yml +++ b/playbooks/byo/openshift-cluster/cluster_hosts.yml @@ -3,9 +3,11 @@ g_etcd_hosts: "{{ groups.etcd | default([]) }}" g_lb_hosts: "{{ groups.lb | default([]) }}" -g_master_hosts: "{{ groups.master | default([]) }}" +g_master_hosts: "{{ groups.masters | default([]) }}" -g_node_hosts: "{{ groups.node | default([]) }}" +g_node_hosts: "{{ groups.nodes | default([]) }}" + +g_nfs_hosts: "{{ groups.nfs | default([]) }}" g_all_hosts: "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts) | union(g_lb_hosts) | default([]) }}" diff --git a/playbooks/gce/openshift-cluster/cluster_hosts.yml b/playbooks/gce/openshift-cluster/cluster_hosts.yml index bea3d0e55..2bfcedfc9 100644 --- a/playbooks/gce/openshift-cluster/cluster_hosts.yml +++ b/playbooks/gce/openshift-cluster/cluster_hosts.yml @@ -15,5 +15,8 @@ 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: "{{ (groups['tag_host-type-nfs']|default([])) + | intersect((groups['tag_environment-' ~ cluster_id]|default([]))) }}" + g_all_hosts: "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts) | union(g_lb_hosts) | default([]) }}" diff --git a/playbooks/libvirt/openshift-cluster/cluster_hosts.yml b/playbooks/libvirt/openshift-cluster/cluster_hosts.yml index ddb872263..198a3e4e2 100644 --- a/playbooks/libvirt/openshift-cluster/cluster_hosts.yml +++ b/playbooks/libvirt/openshift-cluster/cluster_hosts.yml @@ -16,7 +16,7 @@ g_node_hosts: "{{ (groups['tag_host-type-node']|default([])) | intersect((groups['tag_environment-' ~ cluster_env]|default([]))) }}" g_nfs_hosts: "{{ (groups['tag_host-type-node']|default([])) - | intersect((groups['tag_env-' ~ cluster_id]|default([]))) }}" + | intersect((groups['tag_environment-' ~ cluster_id]|default([]))) }}" g_all_hosts: "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts) | union(g_lb_hosts) | default([]) }}" diff --git a/playbooks/openstack/openshift-cluster/cluster_hosts.yml b/playbooks/openstack/openshift-cluster/cluster_hosts.yml index 15712bbde..bc586d983 100644 --- a/playbooks/openstack/openshift-cluster/cluster_hosts.yml +++ b/playbooks/openstack/openshift-cluster/cluster_hosts.yml @@ -16,7 +16,7 @@ g_node_hosts: "{{ (groups['tag_host-type_node']|default([])) | intersect((groups['tag_environment_' ~ cluster_env]|default([]))) }}" g_nfs_hosts: "{{ (groups['tag_host-type_nfs']|default([])) - | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}" + | intersect((groups['tag_environment_' ~ cluster_id]|default([]))) }}" g_all_hosts: "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts) | union(g_lb_hosts) | default([]) }}" |