From 1fc58e74d0a026192b64934b7b23b5ee752dedcc Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 18 Jun 2021 19:57:40 +0100
Subject: [PATCH] Fix up 'Persist nova libvirt secrets in a Docker volume'

Follow up fix for Ia7e923dddb77ff6db3c9160af931354a2b305e8d, which
broke the cephadm jobs.

Change-Id: Ieb39b41a6f493bd00c687610ba043a1b4e5945e7
Related-Bug: #1821696
---
 ansible/roles/nova-cell/templates/nova-libvirt.json.j2 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/nova-cell/templates/nova-libvirt.json.j2 b/ansible/roles/nova-cell/templates/nova-libvirt.json.j2
index c2c5a50c51..f4160c6af4 100644
--- a/ansible/roles/nova-cell/templates/nova-libvirt.json.j2
+++ b/ansible/roles/nova-cell/templates/nova-libvirt.json.j2
@@ -47,14 +47,14 @@
             "source": "{{ container_config_directory }}/secrets",
             "dest": "/etc/libvirt/secrets",
             "owner": "root",
-            "perm": "0600"
+            "perm": "0600",
+            "merge": true
         }{% endif %}{% if nova_backend == "rbd" %},
         {
             "source": "{{ container_config_directory }}/ceph.conf",
             "dest": "/etc/ceph/ceph.conf",
             "owner": "nova",
-            "perm": "0600",
-            "merge": true
+            "perm": "0600"
         }{% endif %}
     ]
 }