From aab3108d87ceaff4933ac157f18909f12adba266 Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Wed, 10 Jan 2018 15:07:01 -0500
Subject: Remove duplication in node acceptance playbook and setup master
groups so that we can use the first master's ansible_ssh_user when
delegating.
---
roles/openshift_aws/tasks/accept_nodes.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'roles/openshift_aws/tasks')
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 }}"
--
cgit v1.2.3