diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-26 20:10:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 20:10:17 -0400 |
| commit | 7eaf5e6316c0d0a40212d6548dc29515efa7f605 (patch) | |
| tree | 9cf2517e0b41e392de5660e5efa91657086fc19a | |
| parent | f7ba21be241e9a3f3354b44332611fe5095fc57f (diff) | |
| parent | dae08d7023018ae8bfbec1a408e1bf20ad0e24a0 (diff) | |
| download | openshift-7eaf5e6316c0d0a40212d6548dc29515efa7f605.tar.gz openshift-7eaf5e6316c0d0a40212d6548dc29515efa7f605.tar.bz2 openshift-7eaf5e6316c0d0a40212d6548dc29515efa7f605.tar.xz openshift-7eaf5e6316c0d0a40212d6548dc29515efa7f605.zip | |
Merge pull request #2502 from sdodson/rhel-73-systemd
test fix for systemd changes
| -rw-r--r-- | roles/etcd/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml index ba4136327..2bc6a8678 100644 --- a/roles/etcd/tasks/main.yml +++ b/roles/etcd/tasks/main.yml @@ -34,16 +34,17 @@ command: systemctl show etcd.service register: etcd_show changed_when: false + failed_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 and etcd_show.rc == 0 and 'LoadState=not-found' not in etcd_show.stdout service: name: etcd state: stopped enabled: no - name: Mask system etcd when containerized - when: etcd_is_containerized | bool and 'LoadState=not-found' not in etcd_show.stdout + when: etcd_is_containerized | bool and etcd_show.rc == 0 and 'LoadState=not-found' not in etcd_show.stdout command: systemctl mask etcd - name: Reload systemd units diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index d8a4aa9bb..ce2f96723 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -178,13 +178,14 @@ command: systemctl show {{ openshift.common.service_type }}-master.service register: master_svc_show changed_when: false + failed_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 and 'LoadState=not-found' not in master_svc_show.stdout + when: openshift_master_ha | bool and master_svc_show.rc == 0 and 'LoadState=not-found' not in master_svc_show.stdout - set_fact: master_service_status_changed: "{{ start_result | changed }}" |