Support for Dell EMC Isilon Manila Driver

This changes adds Dell EMC Isilon backend as composable service
and matches the tripleo-heat-templates.

Change-Id: I30f6b4c4ebe0a708a5eb34cd016544f4d2b9c2bb
Implements: blueprint dellemc-isilon-manila
(cherry picked from commit 75ee7f12f165d4ef6e47600d8c0ec93dff3b610d)

diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp
index 25c3890..814d15a 100644 (file)
--- a/manifests/profile/base/manila/api.pp
+++ b/manifests/profile/base/manila/api.pp
@@ -29,6 +29,9 @@
 # [*backend_vmax_enabled*]
 #   (Optional) Whether or not the vmax backend is enabled
 #   Defaults to hiera('manila_backend_vmax_enabled', false)
+# [*backend_isilon_enabled*]
+#   (Optional) Whether or not the isilon backend is enabled
+#   Defaults to hiera('manila_backend_isilon_enabled', false)
 #
 # [*backend_cephfs_enabled*]
 #   (Optional) Whether or not the cephfs backend is enabled
@@ -47,6 +50,7 @@ class tripleo::profile::base::manila::api (
   $backend_generic_enabled = hiera('manila_backend_generic_enabled', false),
   $backend_netapp_enabled  = hiera('manila_backend_netapp_enabled', false),
   $backend_vmax_enabled    = hiera('manila_backend_vmax_enabled', false),
+  $backend_isilon_enabled  = hiera('manila_backend_isilon_enabled', false),
   $backend_cephfs_enabled  = hiera('manila_backend_cephfs_enabled', false),
   $bootstrap_node          = hiera('bootstrap_nodeid', undef),
   $step                    = Integer(hiera('step')),
@@ -60,7 +64,7 @@ class tripleo::profile::base::manila::api (
   include ::tripleo::profile::base::manila
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
-    if $backend_generic_enabled or $backend_netapp_enabled or $backend_vmax_enabled {
+    if $backend_generic_enabled or $backend_netapp_enabled or $backend_vmax_enabled or $backend_isilon_enabled {
       $nfs_protocol = 'NFS'
       $cifs_protocol = 'CIFS'
     } else {

diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp
index 3fb4e0b..f313f16 100644 (file)
--- a/manifests/profile/pacemaker/manila.pp
+++ b/manifests/profile/pacemaker/manila.pp
@@ -30,6 +30,10 @@
 #   (Optional) Whether or not the vmax backend is enabled
 #   Defaults to hiera('manila_backend_vmax_enabled', false)
 #
+# [*backend_isilon_enabled*]
+#   (Optional) Whether or not the isilon backend is enabled
+#   Defaults to hiera('manila_backend_isilon_enabled', false)
+#
 # [*backend_cephfs_enabled*]
 #   (Optional) Whether or not the cephfs backend is enabled
 #   Defaults to hiera('manila_backend_cephfs_enabled', false)
@@ -51,6 +55,7 @@ class tripleo::profile::pacemaker::manila (
   $backend_generic_enabled = hiera('manila_backend_generic_enabled', false),
   $backend_netapp_enabled  = hiera('manila_backend_netapp_enabled', false),
   $backend_vmax_enabled    = hiera('manila_backend_vmax_enabled', false),
+  $backend_isilon_enabled  = hiera('manila_backend_isilon_enabled', false),
   $backend_cephfs_enabled  = hiera('manila_backend_cephfs_enabled', false),
   $bootstrap_node          = hiera('manila_share_short_bootstrap_node_name'),
   $step                    = Integer(hiera('step')),
@@ -174,12 +179,29 @@ class tripleo::profile::pacemaker::manila (
 
 
 
+    # manila isilon:
+    if $backend_isilon_enabled {
+      $manila_isilon_backend = hiera('manila::backend::dellemc_isilon::title')
+      manila::backend::dellemc_isilon { $manila_isilon_backend :
+        driver_handles_share_servers => hiera('manila::backend::dellemc_isilon::driver_handles_share_servers', false),
+        emc_nas_login                => hiera('manila::backend::dellemc_isilon::emc_nas_login'),
+        emc_nas_password             => hiera('manila::backend::dellemc_isilon::emc_nas_password'),
+        emc_nas_server               => hiera('manila::backend::dellemc_isilon::emc_nas_server'),
+        emc_share_backend            => hiera('manila::backend::dellemc_isilon::emc_share_backend','isilon'),
+        share_backend_name           => hiera('manila::backend::dellemc_isilon::share_backend_name'),
+        emc_nas_root_dir             => hiera('manila::backend::dellemc_isilon::emc_nas_root_dir'),
+        emc_nas_server_port          => hiera('manila::backend::dellemc_isilon::emc_server_port'),
+        emc_nas_server_secure        => hiera('manila::backend::dellemc_isilon::emc_nas_secure'),
+      }
+    }
+
     $manila_enabled_backends = delete_undef_values(
       [
         $manila_generic_backend,
         $manila_cephfsnative_backend,
         $manila_netapp_backend,
-        $manila_vmax_backend
+        $manila_vmax_backend,
+        $manila_isilon_backend
       ]
     )
     class { '::manila::backends' :

diff --git a/releasenotes/notes/isilon_driver_bfa347d073cd11e7.yaml b/releasenotes/notes/isilon_driver_bfa347d073cd11e7.yaml
new file mode 100644 (file)
index 0000000..e6dad75
--- /dev/null
+++ b/releasenotes/notes/isilon_driver_bfa347d073cd11e7.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add support to configure Dell EMC Isilon backend