openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Set proper ceph config path for manila" into stable/newton

Browse Source
This commit is contained in:
Jenkins
2016-10-06 12:36:52 +00:00
committed by Gerrit Code Review
parent 35057721bc f959b9806a
commit 7f43aa1bb9
2 changed files with 2 additions and 2 deletions
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'