summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-28 08:52:20 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-28 08:52:20 -0300
commitdd2506e325d1a2858da353f96251f093e94bbcf3 (patch)
tree132ea0fd3eb8eb707ae396a7e1cbe7abea21e418 /playbooks/common/openshift-cluster/upgrades
parentf004b526078b78b0ba9435b82af4d4f4d42de5e2 (diff)
parentbf520e46e6916a4c9995ea95fa40cdd25f31209e (diff)
downloadopenshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.gz
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.bz2
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.xz
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.zip
Merge branch 'master' into upgrade33
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
index e78418c6c..11e77c3de 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
@@ -209,6 +209,9 @@
msg: This upgrade playbook must be run on OpenShift Enterprise 3.1 or later
when: deployment_type == 'atomic-openshift' and openshift.common.version | version_compare('3.1','<')
+- name: Verify docker upgrade targets
+ hosts: oo_masters_to_config:oo_nodes_to_config:oo_etcd_to_config
+ tasks:
- name: Determine available Docker
script: ../files/rpm_versions.sh docker
register: g_docker_version_result
@@ -263,7 +266,7 @@
- name: Backup etcd
hosts: etcd_hosts_to_backup
vars:
- embedded_etcd: "{{ openshift.master.embedded_etcd }}"
+ embedded_etcd: "{{ hostvars[groups.oo_first_master.0].openshift.master.embedded_etcd }}"
timestamp: "{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}"
roles:
- openshift_facts