summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2018-01-19 15:33:11 -0500
committerGitHub <noreply@github.com>2018-01-19 15:33:11 -0500
commit7ad419c31b79c85d610143f95777040db4b5b1b7 (patch)
tree8bab1fd74d0a57b42934b4cfec82320ce3262d48 /roles
parentb7fa97a3762edccdaa68d6c33c22ef213d6893fe (diff)
parentaab3108d87ceaff4933ac157f18909f12adba266 (diff)
downloadopenshift-7ad419c31b79c85d610143f95777040db4b5b1b7.tar.gz
openshift-7ad419c31b79c85d610143f95777040db4b5b1b7.tar.bz2
openshift-7ad419c31b79c85d610143f95777040db4b5b1b7.tar.xz
openshift-7ad419c31b79c85d610143f95777040db4b5b1b7.zip
Merge pull request #6691 from abutcher/oc-adm-csr-cn
Use master group's ansible_ssh_user when accepting nodes.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_aws/tasks/accept_nodes.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_aws/tasks/accept_nodes.yml b/roles/openshift_aws/tasks/accept_nodes.yml
index c2a2cea30..db30fe5c9 100644
--- a/roles/openshift_aws/tasks/accept_nodes.yml
+++ b/roles/openshift_aws/tasks/accept_nodes.yml
@@ -1,4 +1,6 @@
---
+- include_tasks: setup_master_group.yml
+
- name: fetch masters
ec2_instance_facts:
region: "{{ openshift_aws_region | default('us-east-1') }}"
@@ -36,4 +38,4 @@
nodes: "{{ instancesout.instances|map(attribute='private_dns_name') | list }}"
timeout: 60
register: nodeout
- delegate_to: "{{ mastersout.instances[0].public_ip_address }}"
+ delegate_to: "{{ groups.masters.0 }}"