summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-14 14:25:51 -0500
committerScott Dodson <sdodson@redhat.com>2016-11-14 14:26:45 -0500
commit371c36eae16644bda921550371da713e63e44fac (patch)
treea550e279f680f7f318364587535edd33b3177394 /playbooks/common
parent7dae2f94927b88ab96a6f447e1595a6f2ef88b9b (diff)
downloadopenshift-371c36eae16644bda921550371da713e63e44fac.tar.gz
openshift-371c36eae16644bda921550371da713e63e44fac.tar.bz2
openshift-371c36eae16644bda921550371da713e63e44fac.tar.xz
openshift-371c36eae16644bda921550371da713e63e44fac.zip
Actually upgrade host etcdctl no matter what
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/etcd/containerized_tasks.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/containerized_tasks.yml b/playbooks/common/openshift-cluster/upgrades/etcd/containerized_tasks.yml
index 9ace7db25..35f391f8c 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/containerized_tasks.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/containerized_tasks.yml
@@ -29,9 +29,9 @@
## TODO: probably should just move this into the backup playbooks, also this
## will fail on atomic host. We need to revisit how to do etcd backups there as
## the container may be newer than etcdctl on the host. Assumes etcd3 obsoletes etcd (7.3.1)
-- name: Upgrade etcdctl to 3.0 if necessary and able
+- name: Upgrade etcd for etcdctl when not atomic
action: "{{ ansible_pkg_mgr }} name=etcd ensure=latest"
- when: openshift.common.is_containerized | bool and not openshift.common.is_atomic | bool and upgrade_version | version_compare('3.0','>=')
+ when: not openshift.common.is_atomic | bool
- name: Verify cluster is healthy
command: "etcdctl --cert-file /etc/etcd/peer.crt --key-file /etc/etcd/peer.key --ca-file /etc/etcd/ca.crt -C https://{{ openshift.common.hostname }}:2379 cluster-health"