diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-06 16:08:46 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-06 16:08:46 -0500 |
| commit | bea957eee4365566eeccbe7d95ab974cc2d4d1c7 (patch) | |
| tree | 9e27179bc58b0788c3f779191b404e7089236d10 /roles/openshift_master | |
| parent | 6c5323ad47662ca8ee647c2dd881025d3e66fd66 (diff) | |
| parent | f744401ae8b1968bc0d404f5cb5504c492a2f0aa (diff) | |
| download | openshift-bea957eee4365566eeccbe7d95ab974cc2d4d1c7.tar.gz openshift-bea957eee4365566eeccbe7d95ab974cc2d4d1c7.tar.bz2 openshift-bea957eee4365566eeccbe7d95ab974cc2d4d1c7.tar.xz openshift-bea957eee4365566eeccbe7d95ab974cc2d4d1c7.zip | |
Merge pull request #98 from detiber/copyNotEnvKubeconfig
Do not set KUBECONFIG for root user
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 2f8f8b950..58a8b85ba 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -51,7 +51,28 @@ - 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 - 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 + state: directory + mode: 700 +- name: Configure root user kubeconfig + command: cp /var/lib/openshift/openshift.local.certificates/admin/.kubeconfig /root/.kube/.kubeconfig + args: + creates: /root/.kube/.kubeconfig |