summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-06 12:31:49 +0000
committerGerrit Code Review <review@openstack.org>2016-10-06 12:31:49 +0000
commit022c8586a993613e8f9398e8e141d69e8145f0b7 (patch)
tree332de500bd6f30d545dac2ab50bb71097c8fd7b0
parent2f5fa1ccba61ca85e98e2f8bed641f9f9608ddca (diff)
parent273a4499d6ab38d5d43952c093a9248b2b5471d6 (diff)
Merge "Set proper ceph config path for manila"
-rw-r--r--environments/manila-cephfsnative-config.yaml2
-rw-r--r--puppet/services/manila-backend-cephfs.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/environments/manila-cephfsnative-config.yaml b/environments/manila-cephfsnative-config.yaml
index 4115d8b2..c2f65800 100644
--- a/environments/manila-cephfsnative-config.yaml
+++ b/environments/manila-cephfsnative-config.yaml
@@ -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
diff --git a/puppet/services/manila-backend-cephfs.yaml b/puppet/services/manila-backend-cephfs.yaml
index 89a36d21..37b0a1d2 100644
--- a/puppet/services/manila-backend-cephfs.yaml
+++ b/puppet/services/manila-backend-cephfs.yaml
@@ -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'