commit 23605e5205cc4eb64ab132adabe0e3c79ded2642
author Maksym Shalamov <mshalamov@mirantis.com> Tue Jun 26 15:48:10 2018 +0300
committer Maksym Shalamov <mshalamov@mirantis.com> Tue Jul 17 16:02:26 2018 +0300
tree 9b67c3bddcc4f828ce6e99b401baf8e9d129e035
parent eb059bf58464105f4c7e09167b468fbe6f3e59ff

Add secondary lvm backend for manila

This change is nesessary for manila scenario tempest tests
manila_tempest_tests.tests.scenario.test_share_basic_ops.TestShareBasicOpsNFS
For more ditails please take a look
https://mirantis.jira.com/browse/PROD-19169

Change-Id: Ib3db105dd3f6346cde262cae7e5b6f44b01ec766
Closes-Issue: https://mirantis.jira.com/browse/PROD-19169

classes/cluster/virtual-mcp-pike-dvr/infra/config.yml

diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index b400c32..4f54445 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -27,6 +27,7 @@
 - system.keystone.client.service.gnocchi
 - system.gnocchi.client
 - system.gnocchi.client.v1.archive_policy.default
+- system.manila.client
 - system.reclass.storage.system.openstack_dns_cluster
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
@@ -48,6 +49,12 @@
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
+    manila_share_type_default_extra_specs:
+      driver_handles_share_servers: False
+      snapshot_support: True
+      create_share_from_snapshot_support : True
+      mount_snapshot_support : True
+      revert_to_snapshot_support : True
   linux:
     network:
       interface:

classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml

diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
index 8cef3ce..b8f8abe 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/share.yml
@@ -22,3 +22,20 @@
   manila:
     common:
       default_share_type: default
+    share:
+      enabled_share_backends:
+        lvm: # Explicitly redefine default 'lvm' element from reclass-system
+          name: lvm
+          type: lvm
+          enabled: true
+          dhss: false
+          share_driver: manila.share.drivers.lvm.LVMShareDriver
+        lvm1: # Second backend is needed only to test multibeckend scenario
+          name: lvm1
+          type: lvm
+          enabled: true
+          lvm_share_export_ips:
+            - "${_param:manila_share_address}"
+          dhss: false
+          share_driver: manila.share.drivers.lvm.LVMShareDriver
+          lvm_share_volume_group: manila-volume