summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-09-26 17:17:09 -0400
committerJason DeTiberus <jdetiber@redhat.com>2016-09-26 17:17:09 -0400
commit15959829b9437bb6f695407b6aeb37bce1b4b791 (patch)
tree3057b6eb420c4169b98f9555991691eac24313db /roles
parent09f70e880917354e22b0ca394339e0c1cb9ebe96 (diff)
downloadopenshift-15959829b9437bb6f695407b6aeb37bce1b4b791.tar.gz
openshift-15959829b9437bb6f695407b6aeb37bce1b4b791.tar.bz2
openshift-15959829b9437bb6f695407b6aeb37bce1b4b791.tar.xz
openshift-15959829b9437bb6f695407b6aeb37bce1b4b791.zip
tweak logic
Diffstat (limited to 'roles')
-rw-r--r--roles/etcd/tasks/main.yml4
-rw-r--r--roles/openshift_master/tasks/main.yml2
2 files changed, 3 insertions, 3 deletions
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 }}"