summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-09-29 16:44:01 -0400
committerMichael Gugino <mgugino@redhat.com>2017-10-02 11:34:49 -0400
commitca90c960f14824608e546f71ef777f19ce818c43 (patch)
treea562570cffe345b16cc0b3682f81a1d6c0783eeb
parent614dc4ff5a975be8438c9e034c84dba3410c0a20 (diff)
downloadopenshift-ca90c960f14824608e546f71ef777f19ce818c43.tar.gz
openshift-ca90c960f14824608e546f71ef777f19ce818c43.tar.bz2
openshift-ca90c960f14824608e546f71ef777f19ce818c43.tar.xz
openshift-ca90c960f14824608e546f71ef777f19ce818c43.zip
fix master-facts for provisioning
-rw-r--r--roles/openshift_aws/tasks/master_facts.yml4
-rw-r--r--roles/openshift_aws/tasks/setup_master_group.yml4
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_aws/tasks/master_facts.yml b/roles/openshift_aws/tasks/master_facts.yml
index 6e716d11a..737cfc7a6 100644
--- a/roles/openshift_aws/tasks/master_facts.yml
+++ b/roles/openshift_aws/tasks/master_facts.yml
@@ -5,8 +5,8 @@
names:
- "{{ item }}"
with_items:
- - "{{ openshift_aws_clusterid }}-master-external"
- - "{{ openshift_aws_clusterid }}-master-internal"
+ - "{{ openshift_aws_elb_name }}-external"
+ - "{{ openshift_aws_elb_name }}-internal"
delegate_to: localhost
register: elbs
diff --git a/roles/openshift_aws/tasks/setup_master_group.yml b/roles/openshift_aws/tasks/setup_master_group.yml
index 90233a689..166f3b938 100644
--- a/roles/openshift_aws/tasks/setup_master_group.yml
+++ b/roles/openshift_aws/tasks/setup_master_group.yml
@@ -22,14 +22,14 @@
- name: add new master to masters group
add_host:
groups: "masters,etcd,nodes"
- name: "{{ item.public_ip_address }}"
+ name: "{{ item.public_dns_name }}"
hostname: "{{ openshift_aws_clusterid }}-master-{{ item.id[:-5] }}"
with_items: "{{ instancesout.instances }}"
- name: wait for ssh to become available
wait_for:
port: 22
- host: "{{ item.public_ip_address }}"
+ host: "{{ item.public_dns_name }}"
timeout: 300
search_regex: OpenSSH
with_items: "{{ instancesout.instances }}"