summaryrefslogtreecommitdiffstats
path: root/roles/openshift_aws/tasks
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2018-01-10 15:07:01 -0500
committerAndrew Butcher <abutcher@redhat.com>2018-01-16 16:11:02 -0500
commitaab3108d87ceaff4933ac157f18909f12adba266 (patch)
tree806f3c2bec62326a049c6c999ea52b1f525ff274 /roles/openshift_aws/tasks
parent0d59a0868971e7f038b775adef024a8f324ab010 (diff)
downloadopenshift-aab3108d87ceaff4933ac157f18909f12adba266.tar.gz
openshift-aab3108d87ceaff4933ac157f18909f12adba266.tar.bz2
openshift-aab3108d87ceaff4933ac157f18909f12adba266.tar.xz
openshift-aab3108d87ceaff4933ac157f18909f12adba266.zip
Remove duplication in node acceptance playbook and setup master groups so that we can use the first master's ansible_ssh_user when delegating.
Diffstat (limited to 'roles/openshift_aws/tasks')
-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 }}"