Merge "Bump reclass to the latest version and include manila single" into stable/queens
diff --git a/classes/cluster/virtual-mcp11-aio-manila/openstack/init.yml b/classes/cluster/virtual-mcp11-aio-manila/openstack/init.yml
index 977319e..a3e8660 100755
--- a/classes/cluster/virtual-mcp11-aio-manila/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio-manila/openstack/init.yml
@@ -7,6 +7,7 @@
- system.manila.common.single
- system.manila.share.backend.lvm
- system.manila.client
+- system.manila.control.single
- cluster.virtual-mcp11-aio.openstack
parameters:
_param:
@@ -24,18 +25,6 @@
mount_snapshot_support : True
revert_to_snapshot_support : True
manila:
- common:
- dhss: false
- default_share_type: default
- api:
- version: ${_param:openstack_version}
- enabled: true
- data:
- version: ${_param:openstack_version}
- enabled: true
- scheduler:
- version: ${_param:openstack_version}
- enabled: true
share:
version: ${_param:openstack_version}
enabled: true
diff --git a/classes/system b/classes/system
index 0380418..d1988f6 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 0380418d29d8fe19044a5cd7b05251955aba91a4
+Subproject commit d1988f6d87be3575b90c42345deff5e2603c2fdd