From c7910b51a199eb82a80420c77ed377b2cfbc36a2 Mon Sep 17 00:00:00 2001
From: chenhonggc <chenhong@ghostcloud.cn>
Date: Tue, 14 Nov 2017 05:28:35 -0600
Subject: [PATCH] --peers DEPRECATED - --endpoints should be used instead
(#1943)
---
roles/etcd/tasks/configure.yml | 2 +-
roles/etcd/tasks/join_member.yml | 4 ++--
roles/etcd/tasks/set_cluster_health.yml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/etcd/tasks/configure.yml b/roles/etcd/tasks/configure.yml
index a0a4b5cf4..e6fabaffb 100644
--- a/roles/etcd/tasks/configure.yml
+++ b/roles/etcd/tasks/configure.yml
@@ -1,6 +1,6 @@
---
- name: Configure | Check if member is in cluster
- shell: "{{ bin_dir }}/etcdctl --no-sync --peers={{ etcd_access_addresses }} member list | grep -q {{ etcd_access_address }}"
+ shell: "{{ bin_dir }}/etcdctl --no-sync --endpoints={{ etcd_access_addresses }} member list | grep -q {{ etcd_access_address }}"
register: etcd_member_in_cluster
ignore_errors: true
changed_when: false
diff --git a/roles/etcd/tasks/join_member.yml b/roles/etcd/tasks/join_member.yml
index 47c2fbd6e..53841a144 100644
--- a/roles/etcd/tasks/join_member.yml
+++ b/roles/etcd/tasks/join_member.yml
@@ -1,6 +1,6 @@
---
- name: Join Member | Add member to cluster
- shell: "{{ bin_dir }}/etcdctl --peers={{ etcd_access_addresses }} member add {{ etcd_member_name }} {{ etcd_peer_url }}"
+ shell: "{{ bin_dir }}/etcdctl --endpoints={{ etcd_access_addresses }} member add {{ etcd_member_name }} {{ etcd_peer_url }}"
register: member_add_result
until: member_add_result.rc == 0
retries: 4
@@ -32,7 +32,7 @@
when: target_node == inventory_hostname
- name: Join Member | Ensure member is in cluster
- shell: "{{ bin_dir }}/etcdctl --no-sync --peers={{ etcd_access_addresses }} member list | grep -q {{ etcd_access_address }}"
+ shell: "{{ bin_dir }}/etcdctl --no-sync --endpoints={{ etcd_access_addresses }} member list | grep -q {{ etcd_access_address }}"
register: etcd_member_in_cluster
changed_when: false
check_mode: no
diff --git a/roles/etcd/tasks/set_cluster_health.yml b/roles/etcd/tasks/set_cluster_health.yml
index ecf248fec..ec3a8b988 100644
--- a/roles/etcd/tasks/set_cluster_health.yml
+++ b/roles/etcd/tasks/set_cluster_health.yml
@@ -1,6 +1,6 @@
---
- name: Configure | Check if cluster is healthy
- shell: "{{ bin_dir }}/etcdctl --peers={{ etcd_access_addresses }} cluster-health | grep -q 'cluster is healthy'"
+ shell: "{{ bin_dir }}/etcdctl --endpoints={{ etcd_access_addresses }} cluster-health | grep -q 'cluster is healthy'"
register: etcd_cluster_is_healthy
ignore_errors: true
changed_when: false
--
GitLab