summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-07 13:44:30 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-07 13:44:30 -0500
commitb0ebc4302507ca9464837281ea9cf4aeb5ef4e90 (patch)
treebac509bb6ad7cb25f820967870f5ef2a131626de
parente3938de6e91985e673da461da91e5a04c242c300 (diff)
parentd49da5ef6cd42ad93d685b01aedf62765ff070bb (diff)
downloadopenshift-b0ebc4302507ca9464837281ea9cf4aeb5ef4e90.tar.gz
openshift-b0ebc4302507ca9464837281ea9cf4aeb5ef4e90.tar.bz2
openshift-b0ebc4302507ca9464837281ea9cf4aeb5ef4e90.tar.xz
openshift-b0ebc4302507ca9464837281ea9cf4aeb5ef4e90.zip
Merge pull request #1558 from abutcher/31-minor-new-masters
Default g_new_master_hosts in 3_1 minor upgrade.
-rw-r--r--playbooks/byo/openshift-cluster/upgrades/v3_0_minor/upgrade.yml1
-rw-r--r--playbooks/byo/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml1
-rw-r--r--playbooks/byo/openshift-cluster/upgrades/v3_1_minor/upgrade.yml1
3 files changed, 3 insertions, 0 deletions
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_0_minor/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_0_minor/upgrade.yml
index b52456dcd..628a07752 100644
--- a/playbooks/byo/openshift-cluster/upgrades/v3_0_minor/upgrade.yml
+++ b/playbooks/byo/openshift-cluster/upgrades/v3_0_minor/upgrade.yml
@@ -5,6 +5,7 @@
vars:
g_etcd_hosts: "{{ groups.etcd | default([]) }}"
g_master_hosts: "{{ groups.masters | default([]) }}"
+ g_new_master_hosts: []
g_nfs_hosts: "{{ groups.nfs | default([]) }}"
g_node_hosts: "{{ groups.nodes | default([]) }}"
g_lb_hosts: "{{ groups.lb | default([]) }}"
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
index e07e2b88e..8fadd2ce7 100644
--- a/playbooks/byo/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
+++ b/playbooks/byo/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
@@ -5,6 +5,7 @@
vars:
g_etcd_hosts: "{{ groups.etcd | default([]) }}"
g_master_hosts: "{{ groups.masters | default([]) }}"
+ g_new_master_hosts: []
g_nfs_hosts: "{{ groups.nfs | default([]) }}"
g_node_hosts: "{{ groups.nodes | default([]) }}"
g_lb_hosts: "{{ groups.lb | default([]) }}"
diff --git a/playbooks/byo/openshift-cluster/upgrades/v3_1_minor/upgrade.yml b/playbooks/byo/openshift-cluster/upgrades/v3_1_minor/upgrade.yml
index 20fa9b10f..42078584b 100644
--- a/playbooks/byo/openshift-cluster/upgrades/v3_1_minor/upgrade.yml
+++ b/playbooks/byo/openshift-cluster/upgrades/v3_1_minor/upgrade.yml
@@ -3,6 +3,7 @@
vars:
g_etcd_hosts: "{{ groups.etcd | default([]) }}"
g_master_hosts: "{{ groups.masters | default([]) }}"
+ g_new_master_hosts: []
g_nfs_hosts: "{{ groups.nfs | default([]) }}"
g_node_hosts: "{{ groups.nodes | default([]) }}"
g_lb_hosts: "{{ groups.lb | default([]) }}"