Fix (Upgrade): Update pg-path in local pgbackrest.conf (vitabaks#700)

vitabaks · web-flow · commit 5d5a1857ab42 · 2024-07-17T14:54:44.000+03:00
diff --git a/roles/upgrade/tasks/post_upgrade.yml b/roles/upgrade/tasks/post_upgrade.yml
@@ -96,58 +96,57 @@
 # pgBackRest (local)
 - block:
     - name: pgbackrest | Check pg-path option
-      ansible.builtin.command: "grep -c '^pg.*-path=' {{ pgbackrest_conf_file }}"
+      ansible.builtin.command: "grep -c '^pg[0-9]*-path=' {{ pgbackrest_conf_file }}"
       register: pg_path_count
       changed_when: false
 
     - name: pgbackrest | Update pg-path in pgbackrest.conf
-      ansible.builtin.lineinfile:
+      ansible.builtin.replace:
         path: "{{ pgbackrest_conf_file }}"
-        regexp: '^pg{{ idx + 1 }}-path='
-        line: 'pg{{ idx + 1 }}-path={{ pg_new_datadir }}'
+        regexp: '^pg{{ idx + 1 }}-path=.*$'
+        replace: 'pg{{ idx + 1 }}-path={{ pg_new_datadir }}'
       loop: "{{ range(0, pg_path_count.stdout | int) | list }}"
       loop_control:
         index_var: idx
         label: "pg{{ idx + 1 }}-path={{ pg_new_datadir }}"
-      when: pg_path_count.stdout | length > 0
+      when: pg_path_count.stdout | int > 0
 
     - name: pgbackrest | Upgrade stanza "{{ pgbackrest_stanza }}"
       ansible.builtin.command: "pgbackrest --stanza={{ pgbackrest_stanza }} --no-online stanza-upgrade"
-      when: pg_path_count.stdout | length > 0 and pgbackrest_stanza_upgrade | bool
+      when: pg_path_count.stdout | int > 0 and pgbackrest_stanza_upgrade | bool and pgbackrest_repo_host | length < 1
   become: true
   become_user: postgres
   ignore_errors: true  # show the error and continue the playbook execution
   when:
     - pgbackrest_install | bool
-    - pgbackrest_repo_host | length < 1
 
 # pgBackRest (dedicated)
 - block:
     - name: pgbackrest | Check pg-path option
       delegate_to: "{{ groups['pgbackrest'][0] }}"
       run_once: true
-      ansible.builtin.command: "grep -c '^pg.*-path=' {{ pgbackrest_conf_file | dirname }}/conf.d/{{ pgbackrest_stanza }}.conf"
+      ansible.builtin.command: "grep -c '^pg[0-9]*-path=' {{ pgbackrest_conf_file | dirname }}/conf.d/{{ pgbackrest_stanza }}.conf"
       register: pg_path_count
       changed_when: false
 
     - name: pgbackrest | Update pg-path in pgbackrest.conf
       delegate_to: "{{ groups['pgbackrest'][0] }}"
       run_once: true
-      ansible.builtin.lineinfile:
+      ansible.builtin.replace:
         path: "{{ pgbackrest_conf_file | dirname }}/conf.d/{{ pgbackrest_stanza }}.conf"
-        regexp: '^pg{{ idx + 1 }}-path='
-        line: 'pg{{ idx + 1 }}-path={{ pg_new_datadir }}'
+        regexp: '^pg{{ idx + 1 }}-path=.*$'
+        replace: 'pg{{ idx + 1 }}-path={{ pg_new_datadir }}'
       loop: "{{ range(0, pg_path_count.stdout | int) | list }}"
       loop_control:
         index_var: idx
         label: "pg{{ idx + 1 }}-path={{ pg_new_datadir }}"
-      when: pg_path_count.stdout | length > 0
+      when: pg_path_count.stdout | int > 0
 
     - name: pgbackrest | Upgrade stanza "{{ pgbackrest_stanza }}"
       delegate_to: "{{ groups['pgbackrest'][0] }}"
       run_once: true
       ansible.builtin.command: "pgbackrest --stanza={{ pgbackrest_stanza }} --no-online stanza-upgrade"
-      when: pg_path_count.stdout | length > 0 and pgbackrest_stanza_upgrade | bool
+      when: pg_path_count.stdout | int > 0 and pgbackrest_stanza_upgrade | bool
   become: true
   become_user: "{{ pgbackrest_repo_user }}"
   ignore_errors: true  # show the error and continue the playbook execution
