diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-03-24 14:16:31 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-03-24 14:16:31 -0700 |
| commit | f2f0167b605b541ad74d0aef0392609772692f0d (patch) | |
| tree | 8f377eaba382dc1515a050068e5c3fa83c5106ea /roles/openshift_master/tasks/main.yml | |
| parent | 43ed89371aa2fce56d5e2b41af35a3ae902e92e6 (diff) | |
| parent | 4dc8ca74f47bcbe0fd6285b0d73cc5b193be17a9 (diff) | |
| download | openshift-f2f0167b605b541ad74d0aef0392609772692f0d.tar.gz openshift-f2f0167b605b541ad74d0aef0392609772692f0d.tar.bz2 openshift-f2f0167b605b541ad74d0aef0392609772692f0d.tar.xz openshift-f2f0167b605b541ad74d0aef0392609772692f0d.zip | |
Merge pull request #97 from jwhonce/wip/cluster
Use ansible playbook to initialize openshift cluster
Diffstat (limited to 'roles/openshift_master/tasks/main.yml')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index d5f4776dc..52f5f694c 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -1,4 +1,8 @@ --- +# TODO: allow for overriding default ports where possible +# TODO: if setting up multiple masters, will need to predistribute the certs +# to the additional masters before starting openshift-master + - name: Install OpenShift Master package yum: pkg=openshift-master state=installed @@ -6,9 +10,7 @@ lineinfile: dest: /etc/sysconfig/openshift-master regexp: '^OPTIONS=' - line: "OPTIONS=\"--public-master={{ openshift_hostname }} {% if - openshift_node_ips %} --nodes={{ openshift_node_ips - | join(',') }} {% endif %} --loglevel={{ openshift_master_debug_level }}\"" + line: "OPTIONS=\"--public-master={{ openshift_hostname }} {% if openshift_node_ips %} --nodes={{ openshift_node_ips | join(',') }} {% endif %} --loglevel={{ openshift_master_debug_level }}\"" notify: - restart openshift-master @@ -34,42 +36,15 @@ 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 register: result -#TODO: remove this when origin PR #1204 has landed in OSE -- 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 when: openshift_master_manage_service_externally -# TODO: create an os_vars role that has generic env related config and move -# the root kubeconfig setting there, cannot use dependencies to force ordering -# with openshift_node and openshift_master because the way conditional -# dependencies work with current ansible would also exclude the -# openshift_common dependency. - name: Create .kube directory file: path: /root/.kube |