summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-16 16:20:58 -0800
committerGitHub <noreply@github.com>2018-01-16 16:20:58 -0800
commit214595c511002fd40f8134231ddea4a8e1f9f563 (patch)
treea92d6f3c24929911c08d5d7b6fac58beb773e5a6
parent0c0efec5bc5aebb2d1601c379cdbf23dd69ace7b (diff)
parent518a90253c8308231f032cc22b7da6241d5334b5 (diff)
downloadopenshift-214595c511002fd40f8134231ddea4a8e1f9f563.tar.gz
openshift-214595c511002fd40f8134231ddea4a8e1f9f563.tar.bz2
openshift-214595c511002fd40f8134231ddea4a8e1f9f563.tar.xz
openshift-214595c511002fd40f8134231ddea4a8e1f9f563.zip
Merge pull request #6531 from abutcher/bootstrap-slurp-user
Automatic merge from submit-queue. Use master group ansible_ssh_user to pull bootstrap kubeconfig
-rw-r--r--roles/openshift_aws/tasks/provision_nodes.yml17
1 files changed, 2 insertions, 15 deletions
diff --git a/roles/openshift_aws/tasks/provision_nodes.yml b/roles/openshift_aws/tasks/provision_nodes.yml
index d82f18574..9105b5b4c 100644
--- a/roles/openshift_aws/tasks/provision_nodes.yml
+++ b/roles/openshift_aws/tasks/provision_nodes.yml
@@ -2,25 +2,12 @@
# Get bootstrap config token
# bootstrap should be created on first master
# need to fetch it and shove it into cloud data
-- name: fetch master instances
- ec2_instance_facts:
- region: "{{ openshift_aws_region }}"
- filters:
- "tag:clusterid": "{{ openshift_aws_clusterid }}"
- "tag:host-type": master
- instance-state-name: running
- register: instancesout
- retries: 20
- delay: 3
- until:
- - "'instances' in instancesout"
- - instancesout.instances|length > 0
+- include_tasks: setup_master_group.yml
- name: slurp down the bootstrap.kubeconfig
slurp:
src: /etc/origin/master/bootstrap.kubeconfig
- delegate_to: "{{ instancesout.instances[0].public_ip_address }}"
- remote_user: root
+ delegate_to: "{{ groups.masters.0 }}"
register: bootstrap
- name: set_fact for kubeconfig token