Merge "Persist nova libvirt secrets in a Docker volume"

ansible/roles/nova-cell/defaults/main.yml

@@ -333,6 +333,7 @@ nova_libvirt_default_volumes:
   - "{{ nova_instance_datadir_volume }}:/var/lib/nova/"
   - "{% if enable_shared_var_lib_nova_mnt | bool %}/var/lib/nova/mnt:/var/lib/nova/mnt:shared{% endif %}"
   - "nova_libvirt_qemu:/etc/libvirt/qemu"
+  - "nova_libvirt_secrets:/etc/libvirt/secrets"
   - "{{ kolla_dev_repos_directory ~ '/nova/nova:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/nova' if nova_dev_mode | bool else '' }}"
 nova_ssh_default_volumes:
   - "{{ node_config_directory }}/nova-ssh/:{{ container_config_directory }}/:ro"

ansible/roles/nova-cell/templates/nova-libvirt.json.j2

@@ -53,7 +53,8 @@
             "source": "{{ container_config_directory }}/ceph.conf",
             "dest": "/etc/ceph/ceph.conf",
             "owner": "nova",
-            "perm": "0600"
+            "perm": "0600",
+            "merge": true
         }{% endif %}
     ]
 }

releasenotes/notes/persist-libvirt-secrets-6e07ab2914f40ad3.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue where Libvirt secrets were not persisted. There are no known
+    negative side-effects to this, however it was fixed as a precaution.
+    `LP#1821696 <https://launchpad.net/bugs/1821696>`__