diff --git a/manifests/backend/dellemc_powerflex.pp b/manifests/backend/dellemc_powerflex.pp index 0e90638e..20f6d4da 100644 --- a/manifests/backend/dellemc_powerflex.pp +++ b/manifests/backend/dellemc_powerflex.pp @@ -76,6 +76,14 @@ # (optional) (Boolean) Unmap volumes before deletion. # Defaults to $facts['os_service_default'] # +# [*rest_api_connect_timeout*] +# (Optional) Connection timeout value (in seconds) for rest call. +# Defaults to $facts['os_service_default']. +# +# [*rest_api_read_timeout*] +# (Optional) Read timeout value (in seconds) for rest call. +# Defaults to $facts['os_service_default']. +# # [*san_thin_provision*] # (optional) (Boolean) Whether to use thin provisioning or not. # Defaults to $facts['os_service_default'] @@ -126,6 +134,8 @@ define cinder::backend::dellemc_powerflex( $powerflex_round_volume_capacity = $facts['os_service_default'], $powerflex_server_api_version = $facts['os_service_default'], $powerflex_unmap_volume_before_deletion = $facts['os_service_default'], + $rest_api_connect_timeout = $facts['os_service_default'], + $rest_api_read_timeout = $facts['os_service_default'], $san_thin_provision = $facts['os_service_default'], $driver_ssl_cert_verify = $facts['os_service_default'], $driver_ssl_cert_path = $facts['os_service_default'], @@ -153,6 +163,8 @@ define cinder::backend::dellemc_powerflex( "${name}/powerflex_round_volume_capacity": value => $powerflex_round_volume_capacity; "${name}/powerflex_server_api_version": value => $powerflex_server_api_version; "${name}/powerflex_unmap_volume_before_deletion": value => $powerflex_unmap_volume_before_deletion; + "${name}/rest_api_connect_timeout": value => $rest_api_connect_timeout; + "${name}/rest_api_read_timeout": value => $rest_api_read_timeout; "${name}/san_thin_provision": value => $san_thin_provision; "${name}/driver_ssl_cert_verify": value => $driver_ssl_cert_verify; "${name}/driver_ssl_cert_path": value => $driver_ssl_cert_path; diff --git a/releasenotes/notes/powerflex-timeout-options-b1f353bdb570d825.yaml b/releasenotes/notes/powerflex-timeout-options-b1f353bdb570d825.yaml new file mode 100644 index 00000000..cd4045f6 --- /dev/null +++ b/releasenotes/notes/powerflex-timeout-options-b1f353bdb570d825.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + The following parameters have been added to + the ``cinder::backend::dellemc_powerflex`` defined resource type. + + - ``rest_api_connect_timeout`` + - ``rest_api_read_timeout`` diff --git a/spec/defines/cinder_backend_dellemc_powerflex_spec.rb b/spec/defines/cinder_backend_dellemc_powerflex_spec.rb index 8a1f3183..14771e0a 100644 --- a/spec/defines/cinder_backend_dellemc_powerflex_spec.rb +++ b/spec/defines/cinder_backend_dellemc_powerflex_spec.rb @@ -29,6 +29,8 @@ describe 'cinder::backend::dellemc_powerflex' do :powerflex_unmap_volume_before_deletion => false, :driver_ssl_cert_path => '/path/cert.pem', :driver_ssl_cert_verify => true, + :rest_api_connect_timeout => 30, + :rest_api_read_timeout => 31, } end