summaryrefslogtreecommitdiffstats
path: root/roles/etcd/tasks
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-09 08:37:34 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-09 08:37:34 -0300
commitdcff138a3230a0f23cb627901b2a28cc6bec2e6b (patch)
treecdccad5d89148752bc5acafcbfe80e390366069c /roles/etcd/tasks
parent4bec37c10f835902a42b62493c5df0de97db73f8 (diff)
downloadopenshift-dcff138a3230a0f23cb627901b2a28cc6bec2e6b.tar.gz
openshift-dcff138a3230a0f23cb627901b2a28cc6bec2e6b.tar.bz2
openshift-dcff138a3230a0f23cb627901b2a28cc6bec2e6b.tar.xz
openshift-dcff138a3230a0f23cb627901b2a28cc6bec2e6b.zip
Restore mistakenly reverted code.
Diffstat (limited to 'roles/etcd/tasks')
-rw-r--r--roles/etcd/tasks/main.yml12
1 files changed, 6 insertions, 6 deletions
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