diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-06-02 12:39:25 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-06-02 12:39:25 -0400 |
| commit | 029a0282e57f1ec16c3215ffa9e862f2789b7878 (patch) | |
| tree | 74c935a2f675f6b20d57d73edc0bdda8fb1d1bf3 | |
| parent | c4c6685855a9dc6b4c698465b799c72d6a4f13bd (diff) | |
| parent | 48d0a43a6f7957913607443ca622ba359b9b4db3 (diff) | |
| download | openshift-029a0282e57f1ec16c3215ffa9e862f2789b7878.tar.gz openshift-029a0282e57f1ec16c3215ffa9e862f2789b7878.tar.bz2 openshift-029a0282e57f1ec16c3215ffa9e862f2789b7878.tar.xz openshift-029a0282e57f1ec16c3215ffa9e862f2789b7878.zip | |
Merge pull request #1971 from dgoodwin/missing-services-fix
Fix error with stopping services that may not exist.
| -rw-r--r-- | roles/etcd/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 9 |
2 files changed, 13 insertions, 8 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 diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 63a54a0d9..f70eaf144 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -164,9 +164,14 @@ register: start_result notify: Verify API Server -- name: Stop and disable non HA master when running HA +- name: Check for non-HA master service presence + command: systemctl show {{ openshift.common.service_type }}-master.service + register: master_svc_show + changed_when: false + +- name: Stop and disable non-HA master when running HA service: name={{ openshift.common.service_type }}-master enabled=no state=stopped - when: openshift_master_ha | bool + when: openshift_master_ha | bool and 'LoadState=not-found' not in master_svc_show.stdout - set_fact: master_service_status_changed: "{{ start_result | changed }}" |