diff --git a/manifests/backend/dellemc_unity.pp b/manifests/backend/dellemc_unity.pp index f64441bd..c53cffe6 100644 --- a/manifests/backend/dellemc_unity.pp +++ b/manifests/backend/dellemc_unity.pp @@ -53,6 +53,11 @@ # port and link aggregation port can be used by Unity share driver. # Defaults to None # +# [*unity_share_server*] +# (optional) NAS server used for creating share when driver is in DHSS=False +# mode. It is required when driver_handles_share_servers=False in manila.conf. +# Defaults to $::os_service_default +# # [*network_plugin_ipv6_enabled*] # (optional) Whether to support IPv6 network resource, Default=False. # If this option is True, both IPv4 and IPv6 are supported. @@ -94,6 +99,7 @@ define manila::backend::dellemc_unity ( $unity_server_meta_pool = undef, $unity_share_data_pools = undef, $unity_ethernet_ports = undef, + $unity_share_server = $::os_service_default, $network_plugin_ipv6_enabled = true, $emc_ssl_cert_verify = false, $emc_ssl_cert_path = undef, @@ -119,6 +125,7 @@ define manila::backend::dellemc_unity ( "${share_backend_name}/unity_server_meta_pool": value => $unity_server_meta_pool; "${share_backend_name}/unity_share_data_pools": value => join(any2array($unity_share_data_pools), ','); "${share_backend_name}/unity_ethernet_ports": value => join(any2array($unity_ethernet_ports), ','); + "${share_backend_name}/unity_share_server": value => $unity_share_server; "${share_backend_name}/network_plugin_ipv6_enabled": value => $network_plugin_ipv6_enabled; "${share_backend_name}/emc_ssl_cert_verify": value => $emc_ssl_cert_verify; "${share_backend_name}/emc_ssl_cert_path": value => $emc_ssl_cert_path; diff --git a/releasenotes/notes/unity_share_server-31bce3e772e0b617.yaml b/releasenotes/notes/unity_share_server-31bce3e772e0b617.yaml new file mode 100644 index 00000000..ef5b2cae --- /dev/null +++ b/releasenotes/notes/unity_share_server-31bce3e772e0b617.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The ``manila::backend::dellemc_unity`` resource type now supports + the ``unity_share_server`` parameter. diff --git a/spec/defines/manila_backend_dellemc_unity_spec.rb b/spec/defines/manila_backend_dellemc_unity_spec.rb index ecefb22c..d084113e 100644 --- a/spec/defines/manila_backend_dellemc_unity_spec.rb +++ b/spec/defines/manila_backend_dellemc_unity_spec.rb @@ -13,6 +13,7 @@ describe 'manila::backend::dellemc_unity' do :unity_server_meta_pool => 'pool1', :unity_share_data_pools => '*', :unity_ethernet_ports => 'eth1', + :unity_share_server => '192.168.0.1', :network_plugin_ipv6_enabled => true, :emc_ssl_cert_verify => true, :emc_ssl_cert_path => '/etc/ssl/certs/', @@ -22,14 +23,15 @@ describe 'manila::backend::dellemc_unity' do let :default_params do { - :emc_share_backend => 'unity', - :unity_server_meta_pool => '', - :unity_share_data_pools => '', - :unity_ethernet_ports => '', - :network_plugin_ipv6_enabled => '', - :emc_ssl_cert_verify => '', - :emc_ssl_cert_path => '', - :backend_availability_zone => '', + :emc_share_backend => 'unity', + :unity_server_meta_pool => '', + :unity_share_data_pools => '', + :unity_ethernet_ports => '', + :unity_share_server => '', + :network_plugin_ipv6_enabled => '', + :emc_ssl_cert_verify => '', + :emc_ssl_cert_path => '', + :backend_availability_zone => '', } end