diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-05-30 23:00:37 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-05-31 13:04:30 +0800 |
| commit | b90ecae39cd4c495ccd6b16b663de12bafa279d8 (patch) | |
| tree | 80e89eb46a01076e9db2e56c00546a0ab7c16f9c | |
| parent | 3545e6d503c7451921333134fb75d3fef3713952 (diff) | |
| download | kolla-b90ecae39cd4c495ccd6b16b663de12bafa279d8.tar.gz kolla-b90ecae39cd4c495ccd6b16b663de12bafa279d8.zip | |
Fix the cinder backup permission issue when enable ceph
Closes-Bug: #1587244
Change-Id: I22ed3c57e4669c4372daf448da8385729c7cc8d1
| -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", |