summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-04-23 09:25:10 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-04-23 09:25:10 -0400
commit26dd02a7db33c3aadcfc1687a03709dfb3864525 (patch)
tree1295f307cfa2eb231ec50873a8dce05627aa60ac /roles/openshift_master
parent12ca55504988fe6ea524b222a510d51b0168f95b (diff)
parent720e1b7155f09a659637cc9564cd2e76042345bf (diff)
downloadopenshift-26dd02a7db33c3aadcfc1687a03709dfb3864525.tar.gz
openshift-26dd02a7db33c3aadcfc1687a03709dfb3864525.tar.bz2
openshift-26dd02a7db33c3aadcfc1687a03709dfb3864525.tar.xz
openshift-26dd02a7db33c3aadcfc1687a03709dfb3864525.zip
Merge pull request #168 from detiber/client_config_change
Fixes for latest osc client config changes
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/tasks/main.yml18
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 }}"