浏览代码

fix master-facts for provisioning

Michael Gugino 7 年之前
父节点
当前提交
ca90c960f1
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      roles/openshift_aws/tasks/master_facts.yml
  2. 2 2
      roles/openshift_aws/tasks/setup_master_group.yml

+ 2 - 2
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
 

+ 2 - 2
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 }}"