openstack/kolla-ansible
Code Issues Proposed changes

copy cinder_backup keyring from cinder_backup

Browse Source 
keyring should copy from cinder_backup folder when using external ceph

Change-Id: Ic7c5532355eed1fa1362f84f5c2691f698d5792a
Closes-Bug: 1703733
This commit is contained in:
Kuo-tung Kao 2017-07-12 11:55:44 +08:00
parent 71133abce7
commit 20595eb838
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/cinder/tasks/external_ceph.yml
View File

@ -45,7 +45,7 @@
src: "{{ item }}"
dest: "{{ node_config_directory }}/cinder-backup/"
with_fileglob:
- "{{ node_custom_config }}/cinder/cinder-volume/ceph.client*"
- "{{ node_custom_config }}/cinder/cinder-backup/ceph.client*"
when:
- external_ceph_cephx_enabled | bool
- inventory_hostname in groups['cinder-backup']

9
doc/external-ceph-guide.rst
View File

@ -154,6 +154,11 @@ will be merged with /etc/kolla/config/cinder/ceph.conf.
Ceph keyrings are deployed per service and placed into
cinder-volume and cinder-backup directories:
.. note::
``cinder-backup`` requires two keyrings for accessing volumes
and backup pool.
::
root@deploy:/etc/kolla/config# cat
@ -161,6 +166,10 @@ cinder-volume and cinder-backup directories:
[client.cinder]
key = AQAg5YRXpChaGRAAlTSCleesthCRmCYrfQVX1w==
root@deploy:/etc/kolla/config# cat
cinder/cinder-backup/ceph.client.cinder-backup.keyring
[client.cinder-backup]
key = AQC9wNBYrD8MOBAAwUlCdPKxWZlhkrWIDE1J/w==
root@deploy:/etc/kolla/config# cat
cinder/cinder-volume/ceph.client.cinder.keyring
[client.cinder]
key = AQAg5YRXpChaGRAAlTSCleesthCRmCYrfQVX1w==