summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-25 06:14:13 +0000
committerGerrit Code Review <review@openstack.org>2017-04-25 06:14:13 +0000
commit386ac7791b1ed53445c059ec2b7b9f1a00222a37 (patch)
treeec49b04ac5ab7f2b6daab0ad702803653a6e719c
parent6db405e9dfcc5b5f917612aad526e391bdf7e6de (diff)
parent99371a90a29b4f9ffda606263540a1ef0b919633 (diff)
Merge "Disable Manila CephFS snapshots by default"
-rw-r--r--ci/pingtests/scenario004-multinode.yaml1
-rw-r--r--environments/manila-cephfsnative-config.yaml2
-rw-r--r--puppet/services/manila-backend-cephfs.yaml2
-rw-r--r--releasenotes/notes/disable-manila-cephfs-snapshots-by-default-d5320a05d9b501cf.yaml5
4 files changed, 8 insertions, 2 deletions
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.