Merge pull request #112 from detiber/masterWorkaround

Add workaround for openshift-master startup timeout

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