From 15006764245e0e90ae1951df8543a60db84f9ef9 Mon Sep 17 00:00:00 2001 From: rajinir Date: Fri, 4 Aug 2017 10:37:17 -0500 Subject: [PATCH] Support for Dell EMC VMAX Manila Driver This changes adds Dell EMC VMAX backend as composable service and matches the tripleo-heat-templates. Change-Id: I6e3b4ed6477c7ee56aef4e9849893229ca648c85 Implements: blueprint dellemc-vmax-manila --- manifests/profile/base/manila/api.pp | 7 ++++- manifests/profile/pacemaker/manila.pp | 26 ++++++++++++++++++- .../notes/unity_driver_aaa347d073cd11e7.yaml | 4 +++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/unity_driver_aaa347d073cd11e7.yaml diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp index 95607aea7..25c389099 100644 --- a/manifests/profile/base/manila/api.pp +++ b/manifests/profile/base/manila/api.pp @@ -26,6 +26,10 @@ # (Optional) Whether or not the netapp backend is enabled # Defaults to hiera('manila_backend_netapp_enabled', false) # +# [*backend_vmax_enabled*] +# (Optional) Whether or not the vmax backend is enabled +# Defaults to hiera('manila_backend_vmax_enabled', false) +# # [*backend_cephfs_enabled*] # (Optional) Whether or not the cephfs backend is enabled # Defaults to hiera('manila_backend_cephfs_enabled', false) @@ -42,6 +46,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_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false), $bootstrap_node = hiera('bootstrap_nodeid', undef), $step = Integer(hiera('step')), @@ -55,7 +60,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 { + if $backend_generic_enabled or $backend_netapp_enabled or $backend_vmax_enabled { $nfs_protocol = 'NFS' $cifs_protocol = 'CIFS' } else { diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp index c22a033a7..57d6bb6ce 100644 --- a/manifests/profile/pacemaker/manila.pp +++ b/manifests/profile/pacemaker/manila.pp @@ -26,6 +26,10 @@ # (Optional) Whether or not the netapp backend is enabled # Defaults to hiera('manila_backend_netapp_enabled', false) # +# [*backend_vmax_enabled*] +# (Optional) Whether or not the vmax backend is enabled +# Defaults to hiera('manila_backend_vmax_enabled', false) +# # [*backend_cephfs_enabled*] # (Optional) Whether or not the cephfs backend is enabled # Defaults to hiera('manila_backend_cephfs_enabled', false) @@ -52,6 +56,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_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false), $ceph_mds_enabled = hiera('ceph_mds_enabled', false), $bootstrap_node = hiera('manila_share_short_bootstrap_node_name'), @@ -177,11 +182,30 @@ allow command \"auth get\", allow command \"auth get-or-create\"', } } + # manila vmax: + if $backend_vmax_enabled { + $manila_vmax_backend = hiera('manila::backend::dellemc_vmax::title') + manila::backend::dellemc_vmax { $manila_vmax_backend : + driver_handles_share_servers => hiera('manila::backend::dellemc_vmax::driver_handles_share_servers', true), + emc_nas_login => hiera('manila::backend::dellemc_vmax::emc_nas_login'), + emc_nas_password => hiera('manila::backend::dellemc_vmax::emc_nas_password'), + emc_nas_server => hiera('manila::backend::dellemc_vmax::emc_nas_server'), + emc_share_backend => hiera('manila::backend::dellemc_vmax::emc_share_backend','vmax'), + share_backend_name => hiera('manila::backend::dellemc_vmax::share_backend_name'), + vmax_server_container => hiera('manila::backend::dellemc_vmax::vmax_server_container'), + vmax_share_data_pools => hiera('manila::backend::dellemc_vmax::vmax_share_data_pools'), + vmax_ethernet_ports => hiera('manila::backend::dellemc_vmax::vmax_ethernet_ports'), + } + } + + + $manila_enabled_backends = delete_undef_values( [ $manila_generic_backend, $manila_cephfsnative_backend, - $manila_netapp_backend + $manila_netapp_backend, + $manila_vmax_backend ] ) class { '::manila::backends' : diff --git a/releasenotes/notes/unity_driver_aaa347d073cd11e7.yaml b/releasenotes/notes/unity_driver_aaa347d073cd11e7.yaml new file mode 100644 index 000000000..ccda84892 --- /dev/null +++ b/releasenotes/notes/unity_driver_aaa347d073cd11e7.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Add support to configure Dell EMC VMAX Manila backend