diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-13 05:25:36 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-12-13 05:25:36 -0500 |
| commit | 40ce28e760021571504efe3b89a4034b98c64f4b (patch) | |
| tree | 40b0cc29ba43870b64f0757de295683f4286a3a2 /roles | |
| parent | a2a96007033cc0b874ea95b8d53d576ac31cc3d6 (diff) | |
| parent | 001a092a7f118baa0e2fb7ab0890c306c6f9f004 (diff) | |
| download | openshift-40ce28e760021571504efe3b89a4034b98c64f4b.tar.gz openshift-40ce28e760021571504efe3b89a4034b98c64f4b.tar.bz2 openshift-40ce28e760021571504efe3b89a4034b98c64f4b.tar.xz openshift-40ce28e760021571504efe3b89a4034b98c64f4b.zip | |
Merge pull request #1052 from abutcher/controllers-service
Change controllers service type to simple.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 5 | ||||
| -rw-r--r-- | roles/openshift_master/templates/atomic-openshift-master-controllers.service.j2 | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index bd3d8f90c..8995863ec 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -135,13 +135,11 @@ template: src: atomic-openshift-master-api.service.j2 dest: /usr/lib/systemd/system/{{ openshift.common.service_type }}-master-api.service - force: no when: openshift_master_ha | bool and openshift_master_cluster_method == "native" - name: Create the controllers service file template: src: atomic-openshift-master-controllers.service.j2 dest: /usr/lib/systemd/system/{{ openshift.common.service_type }}-master-controllers.service - force: no when: openshift_master_ha | bool and openshift_master_cluster_method == "native" - name: Create the api env file template: @@ -242,13 +240,10 @@ master_api_service_status_changed = start_result | changed when: openshift_master_ha | bool and openshift.master.cluster_method == 'native' -# TODO: fix the ugly workaround of setting ignore_errors -# the controllers service tries to start even if it is already started - name: Start and enable master controller service: name={{ openshift.common.service_type }}-master-controllers enabled=yes state=started when: openshift_master_ha | bool and openshift.master.cluster_method == 'native' register: start_result - ignore_errors: yes - set_fact: master_controllers_service_status_changed = start_result | changed 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 8952c86ef..ef0b57ef4 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=notify +Type=simple EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-master-controllers Environment=GOTRACEBACK=crash ExecStart=/usr/bin/openshift start master controllers --config=${CONFIG_FILE} $OPTIONS |