diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-19 20:25:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-19 20:25:18 +0000 |
| commit | 0109f99fb14d6220217a7c7dbfda695490d9b0e5 (patch) | |
| tree | 2e4bd3eaf3a7359d5f64e91d7a9625f06e4da65b | |
| parent | 0cb1d969f499df7c4cbbb52a177eefab4973c2d6 (diff) | |
| parent | 81f5b2ac79a5e2a7811bb873e190e80484a901bc (diff) | |
| download | kolla-0109f99fb14d6220217a7c7dbfda695490d9b0e5.tar.gz kolla-0109f99fb14d6220217a7c7dbfda695490d9b0e5.zip | |
Merge "Use "optional" for ceph confs"
| -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" + } ] } |