Merge "Fix missing content in /opt/platform/sysinv/19.09"

playbookconfig/src/playbooks/roles/backup/backup-system/tasks/main.yml

@@ -161,6 +161,7 @@
         - /etc
         - /home
         - "{{ config_permdir }}"
+        - "{{ sysinv_permdir }}"
         - "{{ puppet_permdir }}/hieradata"
         - "{{ keyring_permdir }}"
         - "{{ patching_permdir }}"
@@ -527,6 +528,7 @@
            /etc \
            /home \
            {{ config_permdir }} \
+           {{ sysinv_permdir }} \
            {{ puppet_permdir }}/hieradata \
            {{ keyring_permdir }} \
            {{ patching_permdir }} \

playbookconfig/src/playbooks/roles/backup/prepare-env/tasks/main.yml

@@ -56,6 +56,7 @@
   set_fact:
     keyring_permdir: "{{ platform_path }}/.keyring/{{ software_version }}"
     config_permdir: "{{ platform_path }}/config/{{ software_version }}"
+    sysinv_permdir: "{{ platform_path }}/sysinv/{{ software_version }}"
     puppet_permdir: "{{ platform_path }}/puppet/{{ software_version }}"
     armada_permdir: "{{ platform_path }}/armada/{{ software_version }}"
     helm_charts_permdir: "{{ platform_path }}/helm_charts"

playbookconfig/src/playbooks/roles/bootstrap/persist-config/tasks/main.yml

@@ -27,14 +27,17 @@
     when: tmp_keyring.stat.exists
   when: save_password
 
-- name: Ensure replicated config parent directory exists
+- name: Ensure replicated config parent directories exist
   file:
-    path: "{{ config_permdir }}"
+    path: "{{ item }}"
     state: directory
     recurse: yes
     owner: root
     group: root
     mode: 0755
+  with_items:
+    - "{{ config_permdir }}"
+    - "{{ sysinv_permdir }}"
 
 - name: Get list of new config files
   find:

playbookconfig/src/playbooks/roles/bootstrap/prepare-env/tasks/main.yml

@@ -103,6 +103,7 @@
     set_fact:
       keyring_permdir: "{{ platform_path + '/.keyring/' + software_version }}"
       config_permdir: "{{ platform_path + '/config/' + software_version }}"
+      sysinv_permdir: "{{ platform_path + '/sysinv/' + software_version }}"
       puppet_permdir: "{{ platform_path + '/puppet/' + software_version }}"
 
   - name: Set initial address facts if not defined. They will be updated later

playbookconfig/src/playbooks/roles/restore-platform/restore-more-data/tasks/main.yml

@@ -153,6 +153,13 @@
     - "{{ armada_permdir | regex_replace('^\\/', '') }}"
     - "{{ extension_permdir | regex_replace('^\\/', '') }}"
 
+- name: Restore sysinv default configuration file
+  command: >-
+    tar -C {{ sysinv_config_permdir }} -xpf {{ target_backup_dir }}/{{ backup_filename }}
+    --transform='s,.*/,,' '*/sysinv.conf.default'
+  args:
+    warn: false
+
 # Can't store ceph crushmap at sysinv_config_permdir (/opt/platform/sysinv/)
 # for AIO systems because when unlocking controller-0 for the first time,
 # the crushmap is set thru ceph puppet when /opt/platform is not mounted yet.
@@ -391,6 +398,14 @@
           name: recover-ceph-data
         when: storage_nodes.rc == 0
 
+      - name: Mark crushmap as restored
+        file:
+          path: "{{ sysinv_config_permdir }}/.crushmap_applied"
+          owner: root
+          group: root
+          mode: 644
+          state: touch
+
       when: not wipe_ceph_osds|bool
 
     - name: Inform user that restore_platform is run successfully