openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix the cinder backup permission issue when enable ceph"

Browse Source
This commit is contained in:
Jenkins 2016-05-31 09:48:30 +00:00 committed by Gerrit Code Review
commit e1b8a98cd3
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/cinder/tasks/ceph.yml
View File

@ -52,5 +52,6 @@
mode: "0600" mode: "0600"
with_items: with_items:
- { service_name: "cinder-volume", key_name: "cinder", content: "{{ cephx_key_cinder.stdout }}" } - { 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 }}" } - { service_name: "cinder-backup", key_name: "cinder-backup", content: "{{ cephx_key_cinder_backup.stdout }}" }
when: inventory_hostname in groups['cinder-volume'] when: inventory_hostname in groups['cinder-volume']

7
ansible/roles/cinder/templates/cinder-backup.json.j2
View File

@ -14,6 +14,13 @@
"perm": "0600", "perm": "0600",
"optional": {{ (not enable_ceph | bool) | string | lower }} "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", "source": "{{ container_config_directory }}/ceph.conf",
"dest": "/etc/ceph/ceph.conf", "dest": "/etc/ceph/ceph.conf",