diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-26 17:20:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 17:20:56 -0400 |
| commit | dae08d7023018ae8bfbec1a408e1bf20ad0e24a0 (patch) | |
| tree | 3057b6eb420c4169b98f9555991691eac24313db | |
| parent | 09f70e880917354e22b0ca394339e0c1cb9ebe96 (diff) | |
| parent | 15959829b9437bb6f695407b6aeb37bce1b4b791 (diff) | |
| download | openshift-dae08d7023018ae8bfbec1a408e1bf20ad0e24a0.tar.gz openshift-dae08d7023018ae8bfbec1a408e1bf20ad0e24a0.tar.bz2 openshift-dae08d7023018ae8bfbec1a408e1bf20ad0e24a0.tar.xz openshift-dae08d7023018ae8bfbec1a408e1bf20ad0e24a0.zip | |
Merge pull request #4 from detiber/rhel-73-systemd
tweak logic
| -rw-r--r-- | roles/etcd/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 2 |
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 }}" |