summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-02-02 11:45:27 -0500
committerAndrew Butcher <abutcher@redhat.com>2016-02-02 12:40:36 -0500
commit28df951a35946b42aa5497cabec220258bb9074f (patch)
tree91a29576636e3ea37c1f6061a2f6bc03c1b906d2
parent1cfafd5e34d7ad442b9a1ecc50bc72bac28cc32d (diff)
downloadopenshift-28df951a35946b42aa5497cabec220258bb9074f.tar.gz
openshift-28df951a35946b42aa5497cabec220258bb9074f.tar.bz2
openshift-28df951a35946b42aa5497cabec220258bb9074f.tar.xz
openshift-28df951a35946b42aa5497cabec220258bb9074f.zip
Add g_new_node_hosts to cluster_hosts.
-rw-r--r--playbooks/byo/openshift-cluster/cluster_hosts.yml2
-rw-r--r--playbooks/common/openshift-cluster/evaluate_groups.yml2
2 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/byo/openshift-cluster/cluster_hosts.yml b/playbooks/byo/openshift-cluster/cluster_hosts.yml
index e093b2580..10872e738 100644
--- a/playbooks/byo/openshift-cluster/cluster_hosts.yml
+++ b/playbooks/byo/openshift-cluster/cluster_hosts.yml
@@ -7,6 +7,8 @@ g_master_hosts: "{{ groups.masters | default([]) }}"
g_node_hosts: "{{ groups.nodes | default([]) }}"
+g_new_node_hosts: "{{ groups.new_nodes | default([]) }}"
+
g_nfs_hosts: "{{ groups.nfs | default([]) }}"
g_all_hosts: "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts)
diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml
index db7105ed5..7917bfba5 100644
--- a/playbooks/common/openshift-cluster/evaluate_groups.yml
+++ b/playbooks/common/openshift-cluster/evaluate_groups.yml
@@ -47,7 +47,7 @@
# Use g_new_node_hosts if it exists otherwise g_node_hosts
- set_fact:
- g_node_hosts_to_config: "{{ g_new_node_hosts | default(g_node_hosts | default([])) }}"
+ g_node_hosts_to_config: "{{ g_new_node_hosts | default(g_node_hosts | default([], true), true) }}"
- name: Evaluate oo_nodes_to_config
add_host: