소스 검색

Use notify for workaround controllers unit.

Andrew Butcher 9 년 전
부모
커밋
0d6cc805ad
2개의 변경된 파일1개의 추가작업 그리고 3개의 파일을 삭제
  1. 0 2
      roles/openshift_master/handlers/main.yml
  2. 1 1
      roles/openshift_master/templates/atomic-openshift-master-controllers.service.j2

+ 0 - 2
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

+ 1 - 1
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