diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-13 11:34:19 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-13 11:34:19 -0400 |
| commit | baa950f64d4f1d76847f11cc6e136bff262c4de3 (patch) | |
| tree | 5c8651c0d6cf16a5a2f314784d55f856e46620a4 | |
| parent | a65e9404c6421dc1eee165f5efd066792ec0e471 (diff) | |
| parent | 18be72f713b071e815f67d4a50215ddb63b1012b (diff) | |
| download | openshift-baa950f64d4f1d76847f11cc6e136bff262c4de3.tar.gz openshift-baa950f64d4f1d76847f11cc6e136bff262c4de3.tar.bz2 openshift-baa950f64d4f1d76847f11cc6e136bff262c4de3.tar.xz openshift-baa950f64d4f1d76847f11cc6e136bff262c4de3.zip | |
Merge pull request #112 from detiber/masterWorkaround
Add workaround for openshift-master startup timeout
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 7a7f02be9..d5f4776dc 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -34,6 +34,22 @@ option: externally_managed value: "{{ openshift_master_manage_service_externally }}" +# TODO: remove this when origin PR #1298 has landed in OSE +- name: Workaround for openshift-master taking longer than 90 seconds to issue sdNotify signal + command: cp /usr/lib/systemd/system/openshift-master.service /etc/systemd/system/ + args: + creates: /etc/systemd/system/openshift-master.service +- ini_file: + dest: /etc/systemd/system/openshift-master.service + option: TimeoutStartSec + section: Service + value: 300 + state: present + register: result +- command: systemctl daemon-reload + when: result | changed +# End of workaround pending PR #1298 + - name: Start and enable openshift-master service: name=openshift-master enabled=yes state=started when: not openshift_master_manage_service_externally @@ -43,6 +59,7 @@ - name: need to pause here, otherwise we attempt to copy certificates generated by the master before they are generated pause: seconds=30 when: result | changed +# End of workaround pending PR #1204 - name: Disable openshift-master if openshift-master is managed externally service: name=openshift-master enabled=false |