summaryrefslogtreecommitdiffstats
path: root/roles/etcd/tasks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-06-07 13:51:44 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-06-07 13:51:44 -0400
commit12f351d71b13feb4b808b15f6756fbf6a81de587 (patch)
tree8cd3ea02fb98cae19a6288b02abc508b728c8fc0 /roles/etcd/tasks
parent377405b67551ef51ce6f644bde018986465a1e0c (diff)
parentc45c5935df97bb4aa9e8e9067d868371b04a24bf (diff)
downloadopenshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.gz
openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.bz2
openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.tar.xz
openshift-12f351d71b13feb4b808b15f6756fbf6a81de587.zip
Merge branch 'docker1.10' of https://github.com/dgoodwin/openshift-ansible
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 71735dc25..a798dc973 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 and 'LoadState=not-found' not in etcd_show.stdout
+ when: etcd_is_containerized | bool
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