summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-05 14:21:15 -0500
committerGitHub <noreply@github.com>2017-01-05 14:21:15 -0500
commita3bb391fe3fa1cb8d6ecdd059b6bd65397fa040d (patch)
tree6a9534d7e3b33e26b10836179c37bbc1808708e2
parent6da51335e1bec891bacad0ee528419ab05d9ac79 (diff)
parent3cc4232e756d0f0c0abbe97129598aeac593c75d (diff)
downloadopenshift-a3bb391fe3fa1cb8d6ecdd059b6bd65397fa040d.tar.gz
openshift-a3bb391fe3fa1cb8d6ecdd059b6bd65397fa040d.tar.bz2
openshift-a3bb391fe3fa1cb8d6ecdd059b6bd65397fa040d.tar.xz
openshift-a3bb391fe3fa1cb8d6ecdd059b6bd65397fa040d.zip
Merge pull request #3046 from sdodson/bz1408668
Don't upgrade etcd on atomic host, ever.
-rw-r--r--playbooks/common/openshift-cluster/upgrades/etcd/backup.yml29
1 files changed, 21 insertions, 8 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml
index 0a972adf6..be42f005f 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml
+++ b/playbooks/common/openshift-cluster/upgrades/etcd/backup.yml
@@ -42,15 +42,28 @@
{{ avail_disk.stdout }} Kb available.
when: (embedded_etcd | bool) and (etcd_disk_usage.stdout|int > avail_disk.stdout|int)
- # TODO - Refactor containerized backup to use etcd_container to backup the data so we don't rely on
- # the host's etcdctl binary which may be of a different version.
-
- # for non containerized and non embedded we should have the correct version of etcd installed already
- # For embedded we need to use the latest because OCP 3.3 uses a version of etcd that can only be backed
- # up with etcd-3.x
+ # For non containerized and non embedded we should have the correct version of
+ # etcd installed already. So don't do anything.
+ #
+ # For embedded or containerized we need to use the latest because OCP 3.3 uses
+ # a version of etcd that can only be backed up with etcd-3.x and if it's
+ # containerized then etcd version may be newer than that on the host so
+ # upgrade it.
+ #
+ # On atomic we have neither yum nor dnf so ansible throws a hard to debug error
+ # if you use package there, like this: "Could not find a module for unknown."
+ # see https://bugzilla.redhat.com/show_bug.cgi?id=1408668
+ #
+ # TODO - We should refactor all containerized backups to use the containerized
+ # version of etcd to perform the backup rather than relying on the host's
+ # binaries. Until we do that we'll continue to have problems backing up etcd
+ # when atomic host has an older version than the version that's running in the
+ # container whether that's embedded or not
- name: Install latest etcd for containerized or embedded
- package: name=etcd state=latest
- when: ( openshift.common.is_containerized and not openshift.common.is_atomic ) or embedded_etcd | bool
+ package:
+ name: etcd
+ state: latest
+ when: ( embedded_etcd | bool or openshift.common.is_containerized ) and not openshift.common.is_atomic
- name: Generate etcd backup
command: >