diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-09 08:01:36 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-09 08:01:36 -0400 |
commit | 57db37245e12a190030b4a7075251f37cd83665b (patch) | |
tree | 9617c27a059fc79e95702a4027f69a35c3fb80e2 /roles/openshift_cfme | |
parent | 5fe4c8c5478ef8b87f88b413c9033ff68987d4e1 (diff) | |
parent | c71bed77b350bf66f7c3342ce1e26b9bc389ba3f (diff) | |
download | openshift-57db37245e12a190030b4a7075251f37cd83665b.tar.gz openshift-57db37245e12a190030b4a7075251f37cd83665b.tar.bz2 openshift-57db37245e12a190030b4a7075251f37cd83665b.tar.xz openshift-57db37245e12a190030b4a7075251f37cd83665b.zip |
Merge pull request #4832 from smarterclayton/stop_using_old_mode
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_cfme')
-rw-r--r-- | roles/openshift_cfme/handlers/main.yml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/roles/openshift_cfme/handlers/main.yml b/roles/openshift_cfme/handlers/main.yml index 476a5e030..7e90b09a4 100644 --- a/roles/openshift_cfme/handlers/main.yml +++ b/roles/openshift_cfme/handlers/main.yml @@ -6,19 +6,14 @@ # See: https://github.com/openshift/openshift-ansible/pull/4041#discussion_r118770782 ###################################################################### -- name: restart master - systemd: name={{ openshift.common.service_type }}-master state=restarted - when: (openshift.master.ha is not defined or not openshift.master.ha | bool) and (not (master_service_status_changed | default(false) | bool)) - notify: Verify API Server - - name: restart master api systemd: name={{ openshift.common.service_type }}-master-api state=restarted - when: (openshift.master.ha is defined and openshift.master.ha | bool) and (not (master_api_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native' + when: (not (master_api_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native' notify: Verify API Server - name: restart master controllers systemd: name={{ openshift.common.service_type }}-master-controllers state=restarted - when: (openshift.master.ha is defined and openshift.master.ha | bool) and (not (master_controllers_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native' + when: (not (master_controllers_service_status_changed | default(false) | bool)) and openshift.master.cluster_method == 'native' - name: Verify API Server # Using curl here since the uri module requires python-httplib2 and |