diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-03 14:37:27 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-11-03 14:37:27 -0400 |
| commit | 9d05b8c192a462c9d6a37586fc27cbd93f80ff65 (patch) | |
| tree | 85696c092269859010348ede6fe80ba4c1124543 /roles/etcd/templates | |
| parent | ab83e16dbed3eb5cf1dff96992509439d2739550 (diff) | |
| parent | 3d3f2875bb89cdbdeadd7da4868355669ba12122 (diff) | |
| download | openshift-9d05b8c192a462c9d6a37586fc27cbd93f80ff65.tar.gz openshift-9d05b8c192a462c9d6a37586fc27cbd93f80ff65.tar.bz2 openshift-9d05b8c192a462c9d6a37586fc27cbd93f80ff65.tar.xz openshift-9d05b8c192a462c9d6a37586fc27cbd93f80ff65.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade
Diffstat (limited to 'roles/etcd/templates')
| -rw-r--r-- | roles/etcd/templates/etcd.conf.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/etcd/templates/etcd.conf.j2 b/roles/etcd/templates/etcd.conf.j2 index 9ac23b1dd..32577c96c 100644 --- a/roles/etcd/templates/etcd.conf.j2 +++ b/roles/etcd/templates/etcd.conf.j2 @@ -1,9 +1,9 @@ {% macro initial_cluster() -%} {% for host in groups[etcd_peers_group] -%} {% if loop.last -%} -{{ host }}={{ etcd_peer_url_scheme }}://{{ hostvars[host]['ansible_' + etcd_interface]['ipv4']['address'] }}:{{ etcd_peer_port }} +{{ host }}={{ etcd_peer_url_scheme }}://{{ etcd_host_int_map[host].interface.ipv4.address }}:{{ etcd_peer_port }} {%- else -%} -{{ host }}={{ etcd_peer_url_scheme }}://{{ hostvars[host]['ansible_' + etcd_interface]['ipv4']['address'] }}:{{ etcd_peer_port }}, +{{ host }}={{ etcd_peer_url_scheme }}://{{ etcd_host_int_map[host].interface.ipv4.address }}:{{ etcd_peer_port }}, {%- endif -%} {% endfor -%} {% endmacro -%} |