summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-10-20 16:32:01 -0400
committerGitHub <noreply@github.com>2017-10-20 16:32:01 -0400
commitfa33e24acde96056e3bc6adf0f8f5cb174d12e81 (patch)
tree559af13794fe26bd2644927024f63ef71654a8e2 /playbooks
parent94886b75f51b0647b1478caa0b213a8b39838847 (diff)
parentf546c6b42c672eef7399116b4995e64b62843e1a (diff)
downloadopenshift-fa33e24acde96056e3bc6adf0f8f5cb174d12e81.tar.gz
openshift-fa33e24acde96056e3bc6adf0f8f5cb174d12e81.tar.bz2
openshift-fa33e24acde96056e3bc6adf0f8f5cb174d12e81.tar.xz
openshift-fa33e24acde96056e3bc6adf0f8f5cb174d12e81.zip
Merge pull request #5794 from kwoodson/bz1501271
[bz1501271] Attempt to use ami ssh user and default to ansible_ssh_user.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/aws/openshift-cluster/build_ami.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/aws/openshift-cluster/build_ami.yml b/playbooks/aws/openshift-cluster/build_ami.yml
index ee281929a..5b4a6a1e8 100644
--- a/playbooks/aws/openshift-cluster/build_ami.yml
+++ b/playbooks/aws/openshift-cluster/build_ami.yml
@@ -26,7 +26,7 @@
tasks:
- name: set the user to perform installation
set_fact:
- ansible_ssh_user: "{{ openshift_aws_build_ami_ssh_user | default('root') }}"
+ ansible_ssh_user: "{{ openshift_aws_build_ami_ssh_user | default(ansible_ssh_user) }}"
openshift_node_bootstrap: True
# This is the part that installs all of the software and configs for the instance