summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-22 13:36:22 -0500
committerScott Dodson <sdodson@redhat.com>2017-02-22 13:39:34 -0500
commitfb9a1fbcab380a39ff6cbc965f42099e7ac78b8c (patch)
tree19b4be20af27397a0875875262dfa6d4b0e87aa8
parentc335320eae365ec02c9ede43d229ea59b9968ce5 (diff)
downloadopenshift-fb9a1fbcab380a39ff6cbc965f42099e7ac78b8c.tar.gz
openshift-fb9a1fbcab380a39ff6cbc965f42099e7ac78b8c.tar.bz2
openshift-fb9a1fbcab380a39ff6cbc965f42099e7ac78b8c.tar.xz
openshift-fb9a1fbcab380a39ff6cbc965f42099e7ac78b8c.zip
BZ1414276 - Quote ansible_ssh_user when determining group id
So that domain users of the format 'dom\user' may be used for ansible_ssh_user
-rw-r--r--playbooks/common/openshift-cluster/redeploy-certificates/ca.yml2
-rw-r--r--roles/openshift_master_certificates/tasks/main.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml b/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml
index 9d4d3ea26..2af699209 100644
--- a/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml
+++ b/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml
@@ -294,7 +294,7 @@
client_path: "{{ openshift.common.config_base }}/master/admin.kubeconfig"
ca_path: "{{ openshift.common.config_base }}/master/ca-bundle.crt"
- name: Lookup default group for ansible_ssh_user
- command: "/usr/bin/id -g {{ ansible_ssh_user }}"
+ command: "/usr/bin/id -g {{ ansible_ssh_user | quote }}"
changed_when: false
register: _ansible_ssh_user_gid
- set_fact:
diff --git a/roles/openshift_master_certificates/tasks/main.yml b/roles/openshift_master_certificates/tasks/main.yml
index 7a5ed51ec..61541acb8 100644
--- a/roles/openshift_master_certificates/tasks/main.yml
+++ b/roles/openshift_master_certificates/tasks/main.yml
@@ -159,7 +159,7 @@
become: no
- name: Lookup default group for ansible_ssh_user
- command: "/usr/bin/id -g {{ ansible_ssh_user }}"
+ command: "/usr/bin/id -g {{ ansible_ssh_user | quote }}"
changed_when: false
register: _ansible_ssh_user_gid