From f959b9806aadf4d42c39350224d446a1e530627c Mon Sep 17 00:00:00 2001
From: Tom Barron <tpb@dyncloud.net>
Date: Wed, 5 Oct 2016 17:55:09 -0400
Subject: [PATCH] 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
---
 environments/manila-cephfsnative-config.yaml | 2 +-
 puppet/services/manila-backend-cephfs.yaml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/environments/manila-cephfsnative-config.yaml b/environments/manila-cephfsnative-config.yaml
index 4115d8b2db..c2f65800bf 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 89a36d21fd..37b0a1d258 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'