diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-26 15:47:13 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-09-26 15:47:13 -0400 |
| commit | 09f70e880917354e22b0ca394339e0c1cb9ebe96 (patch) | |
| tree | a638a2dee629705485335ee264d9237d531c56a5 | |
| parent | d5f9fa24a4e5d44ba5eb8637da5393195f0335c9 (diff) | |
| download | openshift-09f70e880917354e22b0ca394339e0c1cb9ebe96.tar.gz openshift-09f70e880917354e22b0ca394339e0c1cb9ebe96.tar.bz2 openshift-09f70e880917354e22b0ca394339e0c1cb9ebe96.tar.xz openshift-09f70e880917354e22b0ca394339e0c1cb9ebe96.zip | |
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..baa197126 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 ('LoadState=not-found' not in etcd_show.stdout or etcd_show.rc != 0) 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 ('LoadState=not-found' not in etcd_show.stdout or etcd_show.rc != 0) 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..5419d3319 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 ( 'LoadState=not-found' not in master_svc_show.stdout or master_svc_show.rc != 0 ) - set_fact: master_service_status_changed: "{{ start_result | changed }}" |