Merge "Disable Manila CephFS snapshots by default"

This commit is contained in:
Jenkins 2017-04-25 06:14:13 +00:00 committed by Gerrit Code Review
commit 386ac7791b
4 changed files with 8 additions and 2 deletions

View File

@ -123,6 +123,7 @@ resources:
properties: properties:
name: default name: default
driver_handles_share_servers: false driver_handles_share_servers: false
snapshot_support: false
manila_share: manila_share:
type: OS::Manila::Share type: OS::Manila::Share

View File

@ -14,4 +14,4 @@ parameter_defaults:
ManilaCephFSNativeCephFSConfPath: '/etc/ceph/ceph.conf' ManilaCephFSNativeCephFSConfPath: '/etc/ceph/ceph.conf'
ManilaCephFSNativeCephFSAuthId: 'manila' ManilaCephFSNativeCephFSAuthId: 'manila'
ManilaCephFSNativeCephFSClusterName: 'ceph' ManilaCephFSNativeCephFSClusterName: 'ceph'
ManilaCephFSNativeCephFSEnableSnapshots: true ManilaCephFSNativeCephFSEnableSnapshots: false

View File

@ -39,7 +39,7 @@ parameters:
default: 'ceph' default: 'ceph'
ManilaCephFSNativeCephFSEnableSnapshots: ManilaCephFSNativeCephFSEnableSnapshots:
type: boolean type: boolean
default: true default: false
ManilaCephFSDataPoolName: ManilaCephFSDataPoolName:
default: manila_data default: manila_data
type: string type: string

View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Disabled cephfs snapshot support (ManilaCephFSNativeCephFSEnableSnapshots
parameter) in manila by default.