summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2015-12-18 14:19:54 -0500
committerAndrew Butcher <abutcher@redhat.com>2015-12-18 14:19:54 -0500
commit0d6cc805ad7ada87c5c39eec518b42b99f1e31f0 (patch)
tree04345ecdf3eb785c24363721c2831bfe801c0185
parentfabc75ca725c6a561bc5e70a63c4dbb2d37bc396 (diff)
downloadopenshift-0d6cc805ad7ada87c5c39eec518b42b99f1e31f0.tar.gz
openshift-0d6cc805ad7ada87c5c39eec518b42b99f1e31f0.tar.bz2
openshift-0d6cc805ad7ada87c5c39eec518b42b99f1e31f0.tar.xz
openshift-0d6cc805ad7ada87c5c39eec518b42b99f1e31f0.zip
Use notify for workaround controllers unit.
-rw-r--r--roles/openshift_master/handlers/main.yml2
-rw-r--r--roles/openshift_master/templates/atomic-openshift-master-controllers.service.j22
2 files changed, 1 insertions, 3 deletions
diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml
index 4b9500cbd..d9c4ba1d7 100644
--- a/roles/openshift_master/handlers/main.yml
+++ b/roles/openshift_master/handlers/main.yml
@@ -7,8 +7,6 @@
service: name={{ openshift.common.service_type }}-master-api state=restarted
when: (openshift_master_ha | bool) and (not master_api_service_status_changed | default(false)) and openshift.master.cluster_method == 'native'
-# TODO: need to fix up ignore_errors here
- name: restart master controllers
service: name={{ openshift.common.service_type }}-master-controllers state=restarted
when: (openshift_master_ha | bool) and (not master_controllers_service_status_changed | default(false)) and openshift.master.cluster_method == 'native'
- ignore_errors: yes
diff --git a/roles/openshift_master/templates/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/atomic-openshift-master-controllers.service.j2
index ef0b57ef4..8952c86ef 100644
--- a/roles/openshift_master/templates/atomic-openshift-master-controllers.service.j2
+++ b/roles/openshift_master/templates/atomic-openshift-master-controllers.service.j2
@@ -7,7 +7,7 @@ Before={{ openshift.common.service_type }}-node.service
Requires=network.target
[Service]
-Type=simple
+Type=notify
EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
Environment=GOTRACEBACK=crash
ExecStart=/usr/bin/openshift start master controllers --config=${CONFIG_FILE} $OPTIONS