summaryrefslogtreecommitdiffstats
path: root/roles/nuage_master
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-02-01 10:30:53 -0500
committerGitHub <noreply@github.com>2018-02-01 10:30:53 -0500
commit24f9b73bb9a6d6197a5028fe0d223c8823e2905e (patch)
treed97de0bd3d574dada209d7ddf4d67b64cb4b46da /roles/nuage_master
parent8d2f2d7820b5c238f4723e4eade3882ca7332685 (diff)
parent4f7d963986a1e28ecc6abd15532b0c1aece99be1 (diff)
downloadopenshift-24f9b73bb9a6d6197a5028fe0d223c8823e2905e.tar.gz
openshift-24f9b73bb9a6d6197a5028fe0d223c8823e2905e.tar.bz2
openshift-24f9b73bb9a6d6197a5028fe0d223c8823e2905e.tar.xz
openshift-24f9b73bb9a6d6197a5028fe0d223c8823e2905e.zip
Merge pull request #6876 from mgugino-upstream-stage/fix-restart-master-play
Remove master_ha bool checks
Diffstat (limited to 'roles/nuage_master')
-rw-r--r--roles/nuage_master/handlers/main.yaml8
1 files changed, 2 insertions, 6 deletions
diff --git a/roles/nuage_master/handlers/main.yaml b/roles/nuage_master/handlers/main.yaml
index 7b55dda56..c0411d641 100644
--- a/roles/nuage_master/handlers/main.yaml
+++ b/roles/nuage_master/handlers/main.yaml
@@ -1,9 +1,7 @@
---
- name: restart master api
systemd: name={{ openshift_service_type }}-master-api state=restarted
- when: >
- (openshift_master_ha | bool) and
- (not master_api_service_status_changed | default(false))
+ when: (not master_api_service_status_changed | default(false))
# TODO: need to fix up ignore_errors here
# We retry the controllers because the API may not be 100% initialized yet.
@@ -13,7 +11,5 @@
delay: 5
register: result
until: result.rc == 0
- when: >
- (openshift_master_ha | bool) and
- (not master_controllers_service_status_changed | default(false))
+ when: (not master_controllers_service_status_changed | default(false))
ignore_errors: yes