Selaa lähdekoodia

test fix for systemd changes

Scott Dodson 8 vuotta sitten
vanhempi
commit
09f70e8809
2 muutettua tiedostoa jossa 5 lisäystä ja 3 poistoa
  1. 3 2
      roles/etcd/tasks/main.yml
  2. 2 1
      roles/openshift_master/tasks/main.yml

+ 3 - 2
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

+ 2 - 1
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 }}"