diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2016-03-28 21:58:48 -0400 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-03-31 15:34:41 -0400 |
commit | 2c608429d81bbe5979cc083c7746219d154e7421 (patch) | |
tree | 961149cce5c0202c42e4c12802d3ba92dface6ff /roles/etcd | |
parent | f716f083d656132fe87b8d398e776661209be0e9 (diff) | |
download | openshift-2c608429d81bbe5979cc083c7746219d154e7421.tar.gz openshift-2c608429d81bbe5979cc083c7746219d154e7421.tar.bz2 openshift-2c608429d81bbe5979cc083c7746219d154e7421.tar.xz openshift-2c608429d81bbe5979cc083c7746219d154e7421.zip |
Bug 1320829 - Ensure docker installed for facts
- gather facts requiring docker only if docker is present and running
- Update reference to etcd role in playbooks/common/openshift-etcd/config.yml
to use openshift_etcd
Diffstat (limited to 'roles/etcd')
-rw-r--r-- | roles/etcd/tasks/main.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml index 064544b03..afec6b30b 100644 --- a/roles/etcd/tasks/main.yml +++ b/roles/etcd/tasks/main.yml @@ -39,7 +39,8 @@ - name: Check for etcd service presence command: systemctl show etcd.service register: etcd_show - + changed_when: false + - name: Mask system etcd when containerized when: openshift.common.is_containerized | bool and 'LoadState=not-found' not in etcd_show.stdout command: systemctl mask etcd |