diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-31 09:48:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-31 09:48:30 +0000 |
| commit | e1b8a98cd3cbbc47b3187516379587701a8656d3 (patch) | |
| tree | 16ff1e676b1d71a3027a0de8aeecfec4a1435411 | |
| parent | 6e1ee2e7dca7a5091bb3879628d94304f7de6023 (diff) | |
| parent | b90ecae39cd4c495ccd6b16b663de12bafa279d8 (diff) | |
| download | kolla-e1b8a98cd3cbbc47b3187516379587701a8656d3.tar.gz kolla-e1b8a98cd3cbbc47b3187516379587701a8656d3.zip | |
Merge "Fix the cinder backup permission issue when enable ceph"
| -rw-r--r-- | ansible/roles/cinder/tasks/ceph.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/cinder/templates/cinder-backup.json.j2 | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ansible/roles/cinder/tasks/ceph.yml b/ansible/roles/cinder/tasks/ceph.yml index a2db0101a..abf4606d9 100644 --- a/ansible/roles/cinder/tasks/ceph.yml +++ b/ansible/roles/cinder/tasks/ceph.yml @@ -52,5 +52,6 @@ mode: "0600" with_items: - { service_name: "cinder-volume", key_name: "cinder", content: "{{ cephx_key_cinder.stdout }}" } + - { service_name: "cinder-backup", key_name: "cinder", content: "{{ cephx_key_cinder.stdout }}" } - { service_name: "cinder-backup", key_name: "cinder-backup", content: "{{ cephx_key_cinder_backup.stdout }}" } when: inventory_hostname in groups['cinder-volume'] diff --git a/ansible/roles/cinder/templates/cinder-backup.json.j2 b/ansible/roles/cinder/templates/cinder-backup.json.j2 index 3e6c27b6e..33929eca4 100644 --- a/ansible/roles/cinder/templates/cinder-backup.json.j2 +++ b/ansible/roles/cinder/templates/cinder-backup.json.j2 @@ -15,6 +15,13 @@ "optional": {{ (not enable_ceph | bool) | string | lower }} }, { + "source": "{{ container_config_directory }}/ceph.client.cinder.keyring", + "dest": "/etc/ceph/ceph.client.cinder.keyring", + "owner": "cinder", + "perm": "0600", + "optional": {{ (not enable_ceph | bool) | string | lower }} + }, + { "source": "{{ container_config_directory }}/ceph.conf", "dest": "/etc/ceph/ceph.conf", "owner": "cinder", |