summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging
diff options
context:
space:
mode:
authorClayton Coleman <ccoleman@redhat.com>2017-07-22 14:08:10 -0400
committerClayton Coleman <ccoleman@redhat.com>2017-08-08 12:50:22 -0400
commit1f527e2f2dbf1508ab249589680a3f9f5a8d4966 (patch)
treeba9c065037272f2d5691dc71a63707ff11f4b0a8 /roles/openshift_logging
parent8da86f5c6842da6bed009f76e3f63e81e9e52c99 (diff)
downloadopenshift-1f527e2f2dbf1508ab249589680a3f9f5a8d4966.tar.gz
openshift-1f527e2f2dbf1508ab249589680a3f9f5a8d4966.tar.bz2
openshift-1f527e2f2dbf1508ab249589680a3f9f5a8d4966.tar.xz
openshift-1f527e2f2dbf1508ab249589680a3f9f5a8d4966.zip
Remove the origin-master.service and associated files
From now on, all master configurations use the api / controller split, regardless of HA mode or previous configuration. This will be our only supported configuration starting in 3.7 or 3.8.
Diffstat (limited to 'roles/openshift_logging')
-rw-r--r--roles/openshift_logging/handlers/main.yml9
1 files changed, 2 insertions, 7 deletions
diff --git a/roles/openshift_logging/handlers/main.yml b/roles/openshift_logging/handlers/main.yml
index 69c5a1663..ce7688581 100644
--- a/roles/openshift_logging/handlers/main.yml
+++ b/roles/openshift_logging/handlers/main.yml
@@ -1,17 +1,12 @@
---
-- 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