summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-05-30 16:04:10 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-05-30 16:04:10 -0300
commit2b9144e782de10627d44afe977cef98686c78a01 (patch)
tree75daff81282d5a445d87e562eceab4edce9a0dbf
parent5b73307fa59680959da5a61e94a0c7316ca0ccb6 (diff)
downloadopenshift-2b9144e782de10627d44afe977cef98686c78a01.tar.gz
openshift-2b9144e782de10627d44afe977cef98686c78a01.tar.bz2
openshift-2b9144e782de10627d44afe977cef98686c78a01.tar.xz
openshift-2b9144e782de10627d44afe977cef98686c78a01.zip
Fix error restarting master service that may not be there.
-rw-r--r--roles/openshift_master/tasks/main.yml9
1 files changed, 7 insertions, 2 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 86942f055..d50d552c8 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -165,9 +165,14 @@
register: start_result
notify: Verify API Server
-- name: Stop and disable non HA master when running HA
+- name: Check for non-HA master service presence
+ command: systemctl show {{ openshift.common.service_type }}-master.service
+ register: master_svc_show
+ changed_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
+ when: openshift_master_ha | bool and 'LoadState=not-found' not in master_svc_show.stdout
- set_fact:
master_service_status_changed: "{{ start_result | changed }}"