From 12f0f6ca435e97984adc0d818370bd06be87c164 Mon Sep 17 00:00:00 2001
From: Jan Provaznik <jprovazn@redhat.com>
Date: Tue, 21 Feb 2017 12:00:48 +0100
Subject: Disable Manila CephFS snapshots by default

Because CephFS Snapshots are still an experimental feature and
also Manila Ceph driver has this feature disabled by default,
it makes sense to not override this value by default.

Change-Id: I3dacbd7a3c673d2f34998ee9f433889727c6a0f7
(cherry picked from commit 99371a90a29b4f9ffda606263540a1ef0b919633)
---
 ci/pingtests/scenario004-multinode.yaml                              | 1 +
 environments/manila-cephfsnative-config.yaml                         | 2 +-
 puppet/services/manila-backend-cephfs.yaml                           | 2 +-
 .../disable-manila-cephfs-snapshots-by-default-d5320a05d9b501cf.yaml | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/disable-manila-cephfs-snapshots-by-default-d5320a05d9b501cf.yaml

diff --git a/ci/pingtests/scenario004-multinode.yaml b/ci/pingtests/scenario004-multinode.yaml
index ebdfea14..8681bbab 100644
--- a/ci/pingtests/scenario004-multinode.yaml
+++ b/ci/pingtests/scenario004-multinode.yaml
@@ -123,6 +123,7 @@ resources:
     properties:
       name: default
       driver_handles_share_servers: false
+      snapshot_support: false
 
   manila_share:
     type: OS::Manila::Share
diff --git a/environments/manila-cephfsnative-config.yaml b/environments/manila-cephfsnative-config.yaml
index 5632d8d6..0cc8fb78 100644
--- a/environments/manila-cephfsnative-config.yaml
+++ b/environments/manila-cephfsnative-config.yaml
@@ -14,4 +14,4 @@ parameter_defaults:
   ManilaCephFSNativeCephFSConfPath: '/etc/ceph/ceph.conf'
   ManilaCephFSNativeCephFSAuthId: 'manila'
   ManilaCephFSNativeCephFSClusterName: 'ceph'
-  ManilaCephFSNativeCephFSEnableSnapshots: true
+  ManilaCephFSNativeCephFSEnableSnapshots: false
diff --git a/puppet/services/manila-backend-cephfs.yaml b/puppet/services/manila-backend-cephfs.yaml
index 36ef1ea9..2a6d7e34 100644
--- a/puppet/services/manila-backend-cephfs.yaml
+++ b/puppet/services/manila-backend-cephfs.yaml
@@ -39,7 +39,7 @@ parameters:
     default: 'ceph'
   ManilaCephFSNativeCephFSEnableSnapshots:
     type: boolean
-    default: true
+    default: false
   ManilaCephFSDataPoolName:
     default: manila_data
     type: string
diff --git a/releasenotes/notes/disable-manila-cephfs-snapshots-by-default-d5320a05d9b501cf.yaml b/releasenotes/notes/disable-manila-cephfs-snapshots-by-default-d5320a05d9b501cf.yaml
new file mode 100644
index 00000000..98d70b63
--- /dev/null
+++ b/releasenotes/notes/disable-manila-cephfs-snapshots-by-default-d5320a05d9b501cf.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Disabled cephfs snapshot support (ManilaCephFSNativeCephFSEnableSnapshots
+    parameter) in manila by default.
-- 
cgit 1.2.3-korg