diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-03 08:29:52 -0500 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-03 08:29:52 -0500 |
commit | 94c5c1fe5c280054132077dedcc1d0b96558a91f (patch) | |
tree | 4cfbf11355dbf2e2631cfe8b9b20937ba4f445da /roles/etcd/templates | |
parent | a4d5e59c413746cb1715b15a9e158be3f3a94a54 (diff) | |
parent | 02a6d993509ac395165c504dba7b92c4f2eb907c (diff) | |
download | openshift-94c5c1fe5c280054132077dedcc1d0b96558a91f.tar.gz openshift-94c5c1fe5c280054132077dedcc1d0b96558a91f.tar.bz2 openshift-94c5c1fe5c280054132077dedcc1d0b96558a91f.tar.xz openshift-94c5c1fe5c280054132077dedcc1d0b96558a91f.zip |
Merge pull request #702 from detiber/etcd_cert_fix
Fix etcd cert generation when etcd_interface is defined
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 -%} |