From 5f6f5146ec143f16dccc17e1719e240e4f9c5fc1 Mon Sep 17 00:00:00 2001
From: Russell Teague <rteague@redhat.com>
Date: Fri, 8 Sep 2017 15:09:27 -0400
Subject: Fix issue with etcd_common when using pre_upgrade tag

---
 roles/etcd_common/tasks/main.yml | 2 +-
 roles/etcd_common/tasks/noop.yml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 roles/etcd_common/tasks/noop.yml

(limited to 'roles')

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
-- 
cgit v1.2.3