summaryrefslogtreecommitdiffstats
path: root/roles/etcd/defaults/main.yaml
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-04-20 12:20:12 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-04-20 12:42:48 -0400
commit43fa4eff62f2497e3ac4dc589e657fbf15dd40ab (patch)
tree243f7d83aa92508a2212830133ff1af6c49ae6b4 /roles/etcd/defaults/main.yaml
parent1f490c2374038669df3d2bfcb01af54361f8907e (diff)
downloadopenshift-43fa4eff62f2497e3ac4dc589e657fbf15dd40ab.tar.gz
openshift-43fa4eff62f2497e3ac4dc589e657fbf15dd40ab.tar.bz2
openshift-43fa4eff62f2497e3ac4dc589e657fbf15dd40ab.tar.xz
openshift-43fa4eff62f2497e3ac4dc589e657fbf15dd40ab.zip
Use openshift_hostname/openshift_ip values for etcd configuration and certificates.
Diffstat (limited to 'roles/etcd/defaults/main.yaml')
-rw-r--r--roles/etcd/defaults/main.yaml10
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml
index e6b10cab7..9ee5ee4a3 100644
--- a/roles/etcd/defaults/main.yaml
+++ b/roles/etcd/defaults/main.yaml
@@ -1,5 +1,5 @@
---
-etcd_service: "{{ 'etcd' if not openshift.common.is_containerized | bool else 'etcd_container' }}"
+etcd_service: "{{ 'etcd' if not etcd_is_containerized | bool else 'etcd_container' }}"
etcd_interface: "{{ ansible_default_ipv4.interface }}"
etcd_client_port: 2379
etcd_peer_port: 2380
@@ -9,10 +9,10 @@ etcd_peer_url_scheme: http
etcd_initial_cluster_state: new
etcd_initial_cluster_token: etcd-cluster-1
-etcd_initial_advertise_peer_urls: "{{ etcd_peer_url_scheme }}://{{ hostvars[inventory_hostname]['ansible_' + etcd_interface]['ipv4']['address'] }}:{{ etcd_peer_port }}"
-etcd_listen_peer_urls: "{{ etcd_peer_url_scheme }}://{{ hostvars[inventory_hostname]['ansible_' + etcd_interface]['ipv4']['address'] }}:{{ etcd_peer_port }}"
-etcd_advertise_client_urls: "{{ etcd_url_scheme }}://{{ hostvars[inventory_hostname]['ansible_' + etcd_interface]['ipv4']['address'] }}:{{ etcd_client_port }}"
-etcd_listen_client_urls: "{{ etcd_url_scheme }}://{{ hostvars[inventory_hostname]['ansible_' + etcd_interface]['ipv4']['address'] }}:{{ etcd_client_port }}"
+etcd_initial_advertise_peer_urls: "{{ etcd_peer_url_scheme }}://{{ etcd_ip }}:{{ etcd_peer_port }}"
+etcd_listen_peer_urls: "{{ etcd_peer_url_scheme }}://{{ etcd_ip }}:{{ etcd_peer_port }}"
+etcd_advertise_client_urls: "{{ etcd_url_scheme }}://{{ etcd_ip }}:{{ etcd_client_port }}"
+etcd_listen_client_urls: "{{ etcd_url_scheme }}://{{ etcd_ip }}:{{ etcd_client_port }}"
etcd_data_dir: /var/lib/etcd/