From 1d4a3de319f3e3f33bd5bd65298c68c04f576085 Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Mon, 30 May 2016 14:29:50 -0300
Subject: Fix error with containerized etcd install.

Role was assuming it could successfully disable the rpm etcd service
without checking if it was actuall present.
---
 roles/etcd/tasks/main.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'roles/etcd')

diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml
index a798dc973..71735dc25 100644
--- a/roles/etcd/tasks/main.yml
+++ b/roles/etcd/tasks/main.yml
@@ -28,18 +28,18 @@
     state: directory
     mode: 0700
 
+- name: Check for etcd service presence
+  command: systemctl show etcd.service
+  register: etcd_show
+  changed_when: false
+
 - name: Disable system etcd when containerized
-  when: etcd_is_containerized | bool
+  when: etcd_is_containerized | bool and 'LoadState=not-found' not in etcd_show.stdout
   service:
     name: etcd
     state: stopped
     enabled: no
 
-- name: Check for etcd service presence
-  command: systemctl show etcd.service
-  register: etcd_show
-  changed_when: false
-
 - name: Mask system etcd when containerized
   when: etcd_is_containerized | bool and 'LoadState=not-found' not in etcd_show.stdout
   command: systemctl mask etcd
-- 
cgit v1.2.3