Merge "Fix the cinder backup permission issue when enable ceph" into stable/mitaka

This commit is contained in:
Jenkins 2016-06-03 02:37:14 +00:00 committed by Gerrit Code Review
commit 7bb9bbf0ca
2 changed files with 8 additions and 0 deletions

View File

@ -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']

View File

@ -14,6 +14,13 @@
"perm": "0600",
"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",