diff options
| -rw-r--r-- | ansible/roles/cinder/templates/cinder-backup.json.j2 | 14 | ||||
| -rw-r--r-- | ansible/roles/cinder/templates/cinder-volume.json.j2 | 10 |
2 files changed, 20 insertions, 4 deletions
diff --git a/ansible/roles/cinder/templates/cinder-backup.json.j2 b/ansible/roles/cinder/templates/cinder-backup.json.j2 index 578e4ad80..2210fbb1c 100644 --- a/ansible/roles/cinder/templates/cinder-backup.json.j2 +++ b/ansible/roles/cinder/templates/cinder-backup.json.j2 @@ -6,6 +6,20 @@ "dest": "/etc/cinder/cinder.conf", "owner": "cinder", "perm": "0600" + }, + { + "source": "{{ container_config_directory }}/ceph.client.cinder-backup.keyring", + "dest": "/etc/ceph/ceph.client.cinder-backup.keyring", + "owner": "cinder", + "perm": "0600", + "optional": "true" + }, + { + "source": "{{ container_config_directory }}/ceph.conf", + "dest": "/etc/ceph/ceph.conf", + "owner": "cinder", + "perm": "0600", + "optional": "true" } ] } diff --git a/ansible/roles/cinder/templates/cinder-volume.json.j2 b/ansible/roles/cinder/templates/cinder-volume.json.j2 index 700ba3f39..531843b37 100644 --- a/ansible/roles/cinder/templates/cinder-volume.json.j2 +++ b/ansible/roles/cinder/templates/cinder-volume.json.j2 @@ -6,18 +6,20 @@ "dest": "/etc/cinder/cinder.conf", "owner": "cinder", "perm": "0600" - }{% if enable_ceph | bool %}, + }, { "source": "{{ container_config_directory }}/ceph.client.cinder.keyring", "dest": "/etc/ceph/ceph.client.cinder.keyring", "owner": "cinder", - "perm": "0600" + "perm": "0600", + "optional": "true" }, { "source": "{{ container_config_directory }}/ceph.conf", "dest": "/etc/ceph/ceph.conf", "owner": "cinder", - "perm": "0600" - }{% endif %} + "perm": "0600", + "optional": "true" + } ] } |