fix backup and lint

canonical · Aug 20, 2023 · 4308373 · 4308373
1 parent 375267e
commit 4308373
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/restore.yaml b/restore.yaml
@@ -7,7 +7,7 @@
     delegate_to: localhost
     become: false
     register: backup_file
-    
+
 - hosts:
     - maas_postgres
     - maas_region_controller

diff --git a/roles/common/tasks/backup.yaml b/roles/common/tasks/backup.yaml
@@ -4,7 +4,11 @@
   when: (('maas_region_controller' in group_names) or ('maas_rack_controller' in group_names)) and (not maas_install_deb | bool)
 
 - name: Backup MAAS snap
-  ansible.builtin.command: snap save maas
+  ansible.builtin.shell: "\
+    set -o pipefail && \
+    snap save maas | awk 'NR==2' | awk '{print $1}'"
+  args:
+    executable: /bin/bash
   register: snap_id
   when: (('maas_region_controller' in group_names) or ('maas_rack_controller' in group_names)) and (not maas_install_deb | bool)
 
@@ -51,4 +55,4 @@
 
 - name: Start MAAS snap
   ansible.builtin.command: snap start maas
-  when: (('maas_region_controller' in group_names) or ('maas_rack_controller' in group_names)) and (not maas_install_deb | bool)
+  when: (('maas_region_controller' in group_names) or ('maas_rack_controller' in group_names)) and (not maas_install_deb | bool)
diff --git a/roles/common/tasks/restore.yaml b/roles/common/tasks/restore.yaml
@@ -28,8 +28,12 @@
   ansible.builtin.command: snap stop maas
   when: (('maas_region_controller' in group_names) or ('maas_rack_controller' in group_names)) and (not maas_install_deb | bool)
 
-- name: Import snap data
-  ansible.builtin.command: "snap import-snapshot /tmp/maas_backup/{{ maas_snap_backup_path }}"
+- name: Backup MAAS snap
+  ansible.builtin.shell: "\
+    set -o pipefail && \
+    snap import-snapshot /tmp/maas_backup/{{ maas_snap_backup_path } | awk 'NR==3' | awk '{print $1}'"
+  args:
+    executable: /bin/bash
   register: snap_id
   when: (('maas_region_controller' in group_names) or ('maas_rack_controller' in group_names)) and (not maas_install_deb | bool)