Browse Source
bugfix: fix grep command without -w option causing prefix matched while adding one etcd member (#10291)
pull/10295/head
yangsenzk
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
4 additions and
4 deletions
-
roles/etcd/tasks/configure.yml
-
roles/etcd/tasks/join_etcd-events_member.yml
-
roles/etcd/tasks/join_etcd_member.yml
|
|
@ -130,7 +130,7 @@ |
|
|
|
ETCDCTL_ENDPOINTS: "{{ etcd_events_access_addresses }}" |
|
|
|
|
|
|
|
- name: Configure | Check if member is in etcd cluster |
|
|
|
shell: "{{ bin_dir }}/etcdctl member list | grep -q {{ etcd_access_address }}" |
|
|
|
shell: "{{ bin_dir }}/etcdctl member list | grep -w -q {{ etcd_access_address }}" |
|
|
|
register: etcd_member_in_cluster |
|
|
|
ignore_errors: true # noqa ignore-errors |
|
|
|
changed_when: false |
|
|
@ -146,7 +146,7 @@ |
|
|
|
ETCDCTL_ENDPOINTS: "{{ etcd_access_addresses }}" |
|
|
|
|
|
|
|
- name: Configure | Check if member is in etcd-events cluster |
|
|
|
shell: "{{ bin_dir }}/etcdctl member list | grep -q {{ etcd_access_address }}" |
|
|
|
shell: "{{ bin_dir }}/etcdctl member list | grep -w -q {{ etcd_access_address }}" |
|
|
|
register: etcd_events_member_in_cluster |
|
|
|
ignore_errors: true # noqa ignore-errors |
|
|
|
changed_when: false |
|
|
|
|
|
@ -26,7 +26,7 @@ |
|
|
|
{%- endfor -%} |
|
|
|
|
|
|
|
- name: Join Member | Ensure member is in etcd-events cluster |
|
|
|
shell: "set -o pipefail && {{ bin_dir }}/etcdctl member list | grep {{ etcd_events_access_address }} >/dev/null" |
|
|
|
shell: "set -o pipefail && {{ bin_dir }}/etcdctl member list | grep -w {{ etcd_events_access_address }} >/dev/null" |
|
|
|
args: |
|
|
|
executable: /bin/bash |
|
|
|
register: etcd_events_member_in_cluster |
|
|
|
|
|
@ -27,7 +27,7 @@ |
|
|
|
{%- endfor -%} |
|
|
|
|
|
|
|
- name: Join Member | Ensure member is in etcd cluster |
|
|
|
shell: "set -o pipefail && {{ bin_dir }}/etcdctl member list | grep {{ etcd_access_address }} >/dev/null" |
|
|
|
shell: "set -o pipefail && {{ bin_dir }}/etcdctl member list | grep -w {{ etcd_access_address }} >/dev/null" |
|
|
|
args: |
|
|
|
executable: /bin/bash |
|
|
|
register: etcd_member_in_cluster |
|
|
|