summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-16 07:49:41 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-16 07:49:41 -0400
commit5dc777b37d6fedbd2aa6b4ef406d970e219e3e8c (patch)
treea3fb5ec9dbdf01588a09ba3737af9d6edda442d8
parentabe9fa08433377d881649968766e3c9b68db916e (diff)
parentdb162014abf5a72a497fe7f5906ce1c6a1982ae5 (diff)
downloadopenshift-5dc777b37d6fedbd2aa6b4ef406d970e219e3e8c.tar.gz
openshift-5dc777b37d6fedbd2aa6b4ef406d970e219e3e8c.tar.bz2
openshift-5dc777b37d6fedbd2aa6b4ef406d970e219e3e8c.tar.xz
openshift-5dc777b37d6fedbd2aa6b4ef406d970e219e3e8c.zip
Merge pull request #1613 from sdodson/bz1317734
Only mask etcd service for containerized installls when it's installed
-rw-r--r--roles/etcd/tasks/main.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml
index d6956de71..064544b03 100644
--- a/roles/etcd/tasks/main.yml
+++ b/roles/etcd/tasks/main.yml
@@ -36,8 +36,12 @@
state: stopped
enabled: no
+- name: Check for etcd service presence
+ command: systemctl show etcd.service
+ register: etcd_show
+
- name: Mask system etcd when containerized
- when: openshift.common.is_containerized | bool
+ when: openshift.common.is_containerized | bool and 'LoadState=not-found' not in etcd_show.stdout
command: systemctl mask etcd
- name: Reload systemd units