diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2015-04-17 15:50:30 -0400 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-04-22 22:38:56 -0400 |
commit | 720e1b7155f09a659637cc9564cd2e76042345bf (patch) | |
tree | 1295f307cfa2eb231ec50873a8dce05627aa60ac /roles/openshift_master | |
parent | 12ca55504988fe6ea524b222a510d51b0168f95b (diff) | |
download | openshift-720e1b7155f09a659637cc9564cd2e76042345bf.tar.gz openshift-720e1b7155f09a659637cc9564cd2e76042345bf.tar.bz2 openshift-720e1b7155f09a659637cc9564cd2e76042345bf.tar.xz openshift-720e1b7155f09a659637cc9564cd2e76042345bf.zip |
Fixes for latest osc client config changes
- also pylint fixes
Diffstat (limited to 'roles/openshift_master')
-rw-r--r-- | roles/openshift_master/tasks/main.yml | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index da184e972..28bdda618 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -84,15 +84,23 @@ - name: Start and enable openshift-master service: name=openshift-master enabled=yes state=started -- name: Create .kube directory +- name: Create the OpenShift client config dir(s) file: - path: /root/.kube + path: "~{{ item }}/.config/openshift" state: directory mode: 0700 + owner: "{{ item }}" + group: "{{ item }}" + with_items: + - root + - "{{ ansible_ssh_user }}" # TODO: Update this file if the contents of the source file are not present in # the dest file, will need to make sure to ignore things that could be added -- name: Configure root user kubeconfig - command: cp {{ openshift_cert_dir }}/openshift-client/.kubeconfig /root/.kube/.kubeconfig +- name: Create the OpenShift client config(s) + command: cp {{ openshift_cert_dir }}/openshift-client/.kubeconfig ~{{ item }}/.config/openshift/.config args: - creates: /root/.kube/.kubeconfig + creates: ~{{ item }}/.config/openshift/.config + with_items: + - root + - "{{ ansible_ssh_user }}" |