From 43fa4eff62f2497e3ac4dc589e657fbf15dd40ab Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Wed, 20 Apr 2016 12:20:12 -0400 Subject: Use openshift_hostname/openshift_ip values for etcd configuration and certificates. --- roles/etcd/defaults/main.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'roles/etcd/defaults') 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/ -- cgit v1.2.3 From add2c9f8b2b64b9a02834c1d321bfecdf3ec7b5b Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Wed, 20 Apr 2016 13:03:45 -0400 Subject: Remove etcd_interface variable. Remove openshift_docker dependency from the etcd role. --- roles/etcd/defaults/main.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'roles/etcd/defaults') diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml index 9ee5ee4a3..a2212bacd 100644 --- a/roles/etcd/defaults/main.yaml +++ b/roles/etcd/defaults/main.yaml @@ -1,6 +1,5 @@ --- 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 etcd_url_scheme: http -- cgit v1.2.3