Fix settings for CephFS data and metadata pools

Although the devstack ceph plugin uses variables - CEPHFS_DATA_POOL and
CEPHFS_METADATA_POOL - as arguments to the 'osd pool create' commands
that provision the pools required for manila to use the CephFS Native
backend, the overrides to the default values for these variables sets
both of them to $CEPHFS_CEPH_POOL. This setting is counter-intuitive,
and worse, forces use of a single pool for both data and metadata in the
case both default values are overridden.

Use CEPHFS_DATA_POOL and CEPHFS_METADATA_POOL as the override
variables for the data pool and metadata pool, respectively.

Change-Id: Iae2859388ce5e74b6f532cf2cf7809aaa09746cb
Closes-Bug: 1593829
This commit is contained in:
Tom Barron 2016-06-17 14:19:50 -04:00
parent 7155b09d95
commit 7540a7946a
1 changed files with 2 additions and 2 deletions

View File

@ -69,8 +69,8 @@ CINDER_CEPH_UUID=${CINDER_CEPH_UUID:-$(uuidgen)}
# Manila
CEPHFS_POOL_PG=${CEPHFS_POOL_PG:-8}
CEPHFS_METADATA_POOL=${CEPHFS_CEPH_POOL:-cephfs_metadata}
CEPHFS_DATA_POOL=${CEPHFS_CEPH_POOL:-cephfs_data}
CEPHFS_METADATA_POOL=${CEPHFS_METADATA_POOL:-cephfs_metadata}
CEPHFS_DATA_POOL=${CEPHFS_DATA_POOL:-cephfs_data}
MANILA_CEPH_DRIVER=${MANILA_CEPH_DRIVER:-cephfsnative}
MANILA_CEPH_USER=${MANILA_CEPH_USER:-manila}
MDS_ID=${MDS_ID:-a}