diff options
author | Russell Teague <rteague@redhat.com> | 2017-09-08 15:09:27 -0400 |
---|---|---|
committer | Russell Teague <rteague@redhat.com> | 2017-09-08 15:09:27 -0400 |
commit | 5f6f5146ec143f16dccc17e1719e240e4f9c5fc1 (patch) | |
tree | f0536080b96940fd3a0377af2431d5ca591fb4ad | |
parent | faed701d8fd50e7ce6540fd59c2f15fea82de0f6 (diff) | |
download | openshift-5f6f5146ec143f16dccc17e1719e240e4f9c5fc1.tar.gz openshift-5f6f5146ec143f16dccc17e1719e240e4f9c5fc1.tar.bz2 openshift-5f6f5146ec143f16dccc17e1719e240e4f9c5fc1.tar.xz openshift-5f6f5146ec143f16dccc17e1719e240e4f9c5fc1.zip |
Fix issue with etcd_common when using pre_upgrade tag
-rw-r--r-- | roles/etcd_common/tasks/main.yml | 2 | ||||
-rw-r--r-- | roles/etcd_common/tasks/noop.yml | 4 |
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 |