summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-11 08:32:27 -0400
committerGitHub <noreply@github.com>2017-09-11 08:32:27 -0400
commit69f03840248a0adadb38b73d9155393af9b069fb (patch)
tree58630cee26ba83e06228e9638ee039a2dcd7b691
parenta1561edf9c116267eb95a8f2a81ee38cfc8e873f (diff)
parent5f6f5146ec143f16dccc17e1719e240e4f9c5fc1 (diff)
downloadopenshift-69f03840248a0adadb38b73d9155393af9b069fb.tar.gz
openshift-69f03840248a0adadb38b73d9155393af9b069fb.tar.bz2
openshift-69f03840248a0adadb38b73d9155393af9b069fb.tar.xz
openshift-69f03840248a0adadb38b73d9155393af9b069fb.zip
Merge pull request #5338 from mtnbikenc/fix-pre_upgrade
Merged by openshift-bot
-rw-r--r--roles/etcd_common/tasks/main.yml2
-rw-r--r--roles/etcd_common/tasks/noop.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/roles/etcd_common/tasks/main.yml b/roles/etcd_common/tasks/main.yml
index f5bcd03ee..6ed87e6c7 100644
--- a/roles/etcd_common/tasks/main.yml
+++ b/roles/etcd_common/tasks/main.yml
@@ -6,4 +6,4 @@
- name: Include main action task file
include: "{{ r_etcd_common_action }}.yml"
- when: '"noop" not in r_etcd_common_action'
+ when: r_etcd_common_action != "noop"
diff --git a/roles/etcd_common/tasks/noop.yml b/roles/etcd_common/tasks/noop.yml
new file mode 100644
index 000000000..a88d78235
--- /dev/null
+++ b/roles/etcd_common/tasks/noop.yml
@@ -0,0 +1,4 @@
+---
+# This is file is here because the usage of tags, specifically `pre_upgrade`
+# breaks the functionality of this role.
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1464025