openstack/kolla-ansible
Code Issues Proposed changes

update cinder configurations in external-ceph-guide.rst

Browse Source 
Change-Id: I0a8a7a7ac7144d3f751c8501b2d35ac847130cfc
This commit is contained in:
weichuancheng@inspur.com 2018-01-18 10:04:28 +08:00 committed by weichuancheng
parent 09ca7d66d5
commit d24a135e14
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
doc/source/reference/external-ceph-guide.rst
View File

@ -85,7 +85,7 @@ Ceph) into the same directory, for example:
:: ::
[client.glance] [client.glance]
key = AQAg5YRXS0qxLRAAXe6a4R1a15AoRx7ft80DhA== key = AQAg5YRXS0qxLRAAXe6a4R1a15AoRx7ft80DhA==
Kolla will pick up all files named ceph.* in this directory an copy them to the Kolla will pick up all files named ceph.* in this directory an copy them to the
/etc/ceph/ directory of the container. /etc/ceph/ directory of the container.
@ -150,25 +150,32 @@ cinder-volume and cinder-backup by adding ceph.conf files to
will be merged with /etc/kolla/config/cinder/ceph.conf. will be merged with /etc/kolla/config/cinder/ceph.conf.
Ceph keyrings are deployed per service and placed into Ceph keyrings are deployed per service and placed into
cinder-volume and cinder-backup directories: cinder-volume and cinder-backup directories, put the keyring files
to these directories, for example:
.. note:: .. note::
``cinder-backup`` requires two keyrings for accessing volumes ``cinder-backup`` requires two keyrings for accessing volumes
and backup pool. and backup pool.
/etc/kolla/config/cinder/cinder-backup/ceph.client.cinder.keyring
:: ::
root@deploy:/etc/kolla/config# cat
cinder/cinder-backup/ceph.client.cinder.keyring
[client.cinder] [client.cinder]
key = AQAg5YRXpChaGRAAlTSCleesthCRmCYrfQVX1w== key = AQAg5YRXpChaGRAAlTSCleesthCRmCYrfQVX1w==
root@deploy:/etc/kolla/config# cat
cinder/cinder-backup/ceph.client.cinder-backup.keyring /etc/kolla/config/cinder/cinder-backup/ceph.client.cinder-backup.keyring
::
[client.cinder-backup] [client.cinder-backup]
key = AQC9wNBYrD8MOBAAwUlCdPKxWZlhkrWIDE1J/w== key = AQC9wNBYrD8MOBAAwUlCdPKxWZlhkrWIDE1J/w==
root@deploy:/etc/kolla/config# cat
cinder/cinder-volume/ceph.client.cinder.keyring /etc/kolla/config/cinder/cinder-volume/ceph.client.cinder.keyring
::
[client.cinder] [client.cinder]
key = AQAg5YRXpChaGRAAlTSCleesthCRmCYrfQVX1w== key = AQAg5YRXpChaGRAAlTSCleesthCRmCYrfQVX1w==