openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Set proper ceph config path for manila 

When deploying manila with cephfs backend,
/etc/manila/manila.conf should define

  cephfs_conf_path = /etc/ceph/ceph.conf

in the cephfs native backend since this is
the conventional path that ceph operators expect
and since we document that path upstream.

Change-Id: I4abf5c33b675b1102413a84d64f4ce23b07b4485
Closes-Bug: 1630777
This commit is contained in:
Tom Barron 2016-10-05 17:55:09 -04:00 committed by Marios Andreou
parent b94b218fe5
commit f959b9806a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/manila-cephfsnative-config.yaml
View File

@ -12,7 +12,7 @@ parameter_defaults:
ManilaCephFSNativeEnableBackend: true
ManilaCephFSNativeBackendName: cephfsnative
ManilaCephFSNativeDriverHandlesShareServers: false
ManilaCephFSNativeCephFSConfPath: '/etc/ceph/cephfs.conf'
ManilaCephFSNativeCephFSConfPath: '/etc/ceph/ceph.conf'
ManilaCephFSNativeCephFSAuthId: 'manila'
ManilaCephFSNativeCephFSClusterName: 'ceph'
ManilaCephFSNativeCephFSEnableSnapshots: true

2
puppet/services/manila-backend-cephfs.yaml
View File

@ -33,7 +33,7 @@ parameters:
default: 'cephfs'
ManilaCephFSNativeCephFSConfPath:
type: string
default: '/etc/ceph/cephfs.conf'
default: '/etc/ceph/ceph.conf'
ManilaCephFSNativeCephFSAuthId:
type: string
default: 'manila'