diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 15 | 
1 files changed, 6 insertions, 9 deletions
| diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 759cda7d0..1f499dc93 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -319,6 +319,9 @@    changed_when: false    register: _ansible_ssh_user_gid +- set_fact: +    client_users: "{{ [ansible_ssh_user, 'root'] | unique }}" +  - name: Create the client config dir(s)    file:      path: "~{{ item }}/.kube" @@ -326,9 +329,7 @@      mode: 0700      owner: "{{ item }}"      group: "{{ 'root' if item == 'root' else _ansible_ssh_user_gid.stdout  }}" -  with_items: -  - root -  - "{{ ansible_ssh_user }}" +  with_items: client_users  # 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 @@ -336,9 +337,7 @@    command: cp {{ openshift_master_config_dir }}/admin.kubeconfig ~{{ item }}/.kube/config    args:      creates: ~{{ item }}/.kube/config -  with_items: -  - root -  - "{{ ansible_ssh_user }}" +  with_items: client_users  - name: Update the permissions on the admin client config(s)    file: @@ -347,6 +346,4 @@      mode: 0700      owner: "{{ item }}"      group: "{{ 'root' if item == 'root' else _ansible_ssh_user_gid.stdout  }}" -  with_items: -  - root -  - "{{ ansible_ssh_user }}" +  with_items: client_users | 
