From 7c22def4226753bdde191ba89582c50cf95fdefb Mon Sep 17 00:00:00 2001
From: elementyang <yangym9@lenovo.com>
Date: Sat, 30 Jun 2018 07:32:29 +0800
Subject: [PATCH] add etcd_events_access_address
---
roles/etcd/tasks/join_etcd-events_member.yml | 2 +-
roles/kubespray-defaults/defaults/main.yaml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/roles/etcd/tasks/join_etcd-events_member.yml b/roles/etcd/tasks/join_etcd-events_member.yml
index e66ddf4bf..d5df065f9 100644
--- a/roles/etcd/tasks/join_etcd-events_member.yml
+++ b/roles/etcd/tasks/join_etcd-events_member.yml
@@ -24,7 +24,7 @@
when: target_node == inventory_hostname
- name: Join Member | Ensure member is in etcd-events cluster
- shell: "{{ bin_dir }}/etcdctl --no-sync --endpoints={{ etcd_events_access_addresses }} member list | grep -q {{ etcd_events_access_addresses }}"
+ shell: "{{ bin_dir }}/etcdctl --no-sync --endpoints={{ etcd_events_access_addresses }} member list | grep -q {{ etcd_events_access_address }}"
register: etcd_events_member_in_cluster
changed_when: false
check_mode: no
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index 2394ec4b7..347150850 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -322,6 +322,7 @@ etcd_events_cluster_enabled: false
is_etcd_master: "{{ inventory_hostname in groups['etcd'] }}"
etcd_address: "{{ ip | default(ansible_default_ipv4['address']) }}"
etcd_access_address: "{{ access_ip | default(etcd_address) }}"
+etcd_events_access_address: "{{ access_ip | default(etcd_address) }}"
etcd_peer_url: "https://{{ etcd_access_address }}:2380"
etcd_client_url: "https://{{ etcd_access_address }}:2379"
etcd_events_peer_url: "https://{{ etcd_access_address }}:2382"
--
GitLab