fix(garage): make bootstrap & provision idempotent across reruns
* bootstrap: `garage layout show` truncates node IDs to 16 chars, but
the membership check compared against the full hex. After the first
successful join, subsequent runs no longer found the short ID in
`layout show` and re-issued `layout assign`, marking the task
changed every time. Compare against both the truncated and the full
form so a configured node stays detected. Also tag the read-only
`garage node id` / `layout show` probes with `changed_when: false`.
* provision keys: the old parser sliced `stdout_lines[1:]` to drop the
header but missed that INFO log lines and ANSI escapes can interleave
with table rows. Replace with an explicit `^GK[0-9a-fA-F]+` filter
after stripping ANSI, so probe-output noise no longer corrupts the
existing-keys set and triggers spurious `key new` calls.
* provision buckets: same class of fix — match `^[0-9a-f]{16}\s` data
rows instead of slicing `[2:]`, which broke when the table header
wasn't exactly two lines.
* provision permissions: pre-read `bucket info` for each (key, bucket)
pair and only run `bucket allow` when the current `RWO` flag set for
that key ID doesn't already match the desired permissions. Previously
`bucket allow` ran unconditionally and reported changed every play.
* `changed_when: false` on all read-only probes (`key list`, `key info`,
`bucket list`).
This commit is contained in:
parent
c27584cd9c
commit
1157448d59
2 changed files with 55 additions and 6 deletions
|
|
@ -7,21 +7,27 @@
|
|||
container: "{{ garage_service_name }}"
|
||||
command: /garage node id -q
|
||||
register: _garage_node_id
|
||||
changed_when: false
|
||||
|
||||
- name: Extract short node ID
|
||||
ansible.builtin.set_fact:
|
||||
_garage_node_id_short: "{{ _garage_node_id.stdout.split('@')[0] }}"
|
||||
|
||||
- name: Extract truncated node ID (first 16 chars, matches `garage layout show` output)
|
||||
ansible.builtin.set_fact:
|
||||
_garage_node_id_truncated: "{{ _garage_node_id_short[:16] }}"
|
||||
|
||||
- name: Check if node layout is configured
|
||||
community.docker.docker_container_exec:
|
||||
container: "{{ garage_service_name }}"
|
||||
command: /garage layout show
|
||||
register: _garage_layout_show
|
||||
failed_when: false
|
||||
changed_when: false
|
||||
|
||||
- name: Check if node is in layout
|
||||
ansible.builtin.set_fact:
|
||||
_node_in_layout: "{{ _garage_node_id_short in _garage_layout_show.stdout }}"
|
||||
_node_in_layout: "{{ (_garage_node_id_truncated in _garage_layout_show.stdout) or (_garage_node_id_short in _garage_layout_show.stdout) }}"
|
||||
|
||||
- name: Configure garage node layout
|
||||
community.docker.docker_container_exec:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue