openstack/kolla-ansible
Code Issues Proposed changes

Fix up 'Persist nova libvirt secrets in a Docker volume'

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

Change-Id: Ieb39b41a6f493bd00c687610ba043a1b4e5945e7
Related-Bug: #1821696
This commit is contained in:
Mark Goddard 2021-06-18 19:57:40 +01:00
parent ea25df305d
commit 1fc58e74d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/nova-cell/templates/nova-libvirt.json.j2
View File

@ -47,14 +47,14 @@
"source": "{{ container_config_directory }}/secrets", "source": "{{ container_config_directory }}/secrets",
"dest": "/etc/libvirt/secrets", "dest": "/etc/libvirt/secrets",
"owner": "root", "owner": "root",
"perm": "0600" "perm": "0600",
"merge": true
}{% endif %}{% if nova_backend == "rbd" %}, }{% endif %}{% if nova_backend == "rbd" %},
{ {
"source": "{{ container_config_directory }}/ceph.conf", "source": "{{ container_config_directory }}/ceph.conf",
"dest": "/etc/ceph/ceph.conf", "dest": "/etc/ceph/ceph.conf",
"owner": "nova", "owner": "nova",
"perm": "0600", "perm": "0600"
"merge": true
}{% endif %} }{% endif %}
] ]
} }