summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-12-07 20:19:01 -0500
committerGitHub <noreply@github.com>2016-12-07 20:19:01 -0500
commitd4771b1a9a331393f5f4bf6c1cdf130637546c43 (patch)
tree8bc678dfe5a03e0ec91dfe70cc30ff74ee40c56c
parent4a720359613da16a9cd4ed547dddccee14735aa0 (diff)
parent642de6224c2c3d95a6a240dbc17724317b76b1c7 (diff)
downloadopenshift-d4771b1a9a331393f5f4bf6c1cdf130637546c43.tar.gz
openshift-d4771b1a9a331393f5f4bf6c1cdf130637546c43.tar.bz2
openshift-d4771b1a9a331393f5f4bf6c1cdf130637546c43.tar.xz
openshift-d4771b1a9a331393f5f4bf6c1cdf130637546c43.zip
Merge pull request #2934 from sdodson/etcd3-v2
etcd_upgrade: Simplify package installation
-rw-r--r--playbooks/common/openshift-cluster/upgrades/etcd/rhel_tasks.yml11
1 files changed, 4 insertions, 7 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/rhel_tasks.yml b/playbooks/common/openshift-cluster/upgrades/etcd/rhel_tasks.yml
index 8e7dc9d9b..3a972e8ab 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/rhel_tasks.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/rhel_tasks.yml
@@ -2,13 +2,10 @@
- name: Verify cluster is healthy pre-upgrade
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"
-- name: Update etcd package but exclude etcd3
- command: "{{ ansible_pkg_mgr }} install -y etcd-{{ upgrade_version }}\\* --exclude etcd3"
- when: upgrade_version | version_compare('3.0','<')
-
-- name: Update etcd package not excluding etcd3
- command: "{{ ansible_pkg_mgr }} install -y etcd3-{{ upgrade_version }}\\*"
- when: not upgrade_version | version_compare('3.0','<')
+- name: Update etcd RPM
+ package:
+ name: etcd-{{ upgrade_version }}*
+ state: latest
- name: Restart etcd
service: