summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-12-05 15:42:20 -0500
committerGitHub <noreply@github.com>2017-12-05 15:42:20 -0500
commitb879f67881b1abcc8f614e1e6ca1b5cdc2cc2649 (patch)
treed8ea0b2afe7df6c400160c7b2f3870f9e44bc6a8 /roles/openshift_logging
parent968f614e984da91a4e883a9642af8e66d49d87a0 (diff)
parent259272fa2359fd4d3bd78291bd0b06a1261c4b01 (diff)
downloadopenshift-b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649.tar.gz
openshift-b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649.tar.bz2
openshift-b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649.tar.xz
openshift-b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649.zip
Merge pull request #6155 from abutcher/remove-pacemaker
Remove all references to pacemaker (pcs, pcsd) and openshift.master.cluster_method.
Diffstat (limited to 'roles/openshift_logging')
-rw-r--r--roles/openshift_logging/handlers/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging/handlers/main.yml b/roles/openshift_logging/handlers/main.yml
index 074b72942..e0329ee7c 100644
--- a/roles/openshift_logging/handlers/main.yml
+++ b/roles/openshift_logging/handlers/main.yml
@@ -1,7 +1,7 @@
---
- name: restart master api
systemd: name={{ openshift.common.service_type }}-master-api state=restarted
- when: (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))
notify: Verify API Server
# We retry the controllers because the API may not be 100% initialized yet.
@@ -11,7 +11,7 @@
delay: 5
register: result
until: result.rc == 0
- when: (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))
- name: Verify API Server
# Using curl here since the uri module requires python-httplib2 and