From 09f70e880917354e22b0ca394339e0c1cb9ebe96 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Mon, 26 Sep 2016 15:47:13 -0400 Subject: test fix for systemd changes --- roles/etcd/tasks/main.yml | 5 +++-- roles/openshift_master/tasks/main.yml | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'roles') 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 }}" -- cgit v1.2.3 From 15959829b9437bb6f695407b6aeb37bce1b4b791 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Mon, 26 Sep 2016 17:17:09 -0400 Subject: tweak logic --- roles/etcd/tasks/main.yml | 4 ++-- roles/openshift_master/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'roles') diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml index baa197126..2bc6a8678 100644 --- a/roles/etcd/tasks/main.yml +++ b/roles/etcd/tasks/main.yml @@ -37,14 +37,14 @@ failed_when: false - name: Disable system etcd when containerized - when: etcd_is_containerized | bool and ('LoadState=not-found' not in etcd_show.stdout or etcd_show.rc != 0) + 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 or etcd_show.rc != 0) + 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 5419d3319..ce2f96723 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -185,7 +185,7 @@ 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 or master_svc_show.rc != 0 ) + 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 }}" -- cgit v1.2.3