Merge "Solidfire: Improve parameter coverage"

manifests/backend/solidfire.pp

@@ -59,6 +59,34 @@
 #   (optional) Utilize volume access groups on a per-tenant basis.
 #   Defaults to $::os_service_default
 #
+# [*sf_provisioning_calc*]
+#   (optional) Change how SolidFire reports used space and provisioning
+#   calculations.
+#   Defaults to $::os_service_default
+#
+# [*sf_cluster_pairing_timeout*]
+#   (optional) Sets time in seconds to wait for cluster to complete paring.
+#   Defaults to $::os_service_default
+#
+# [*sf_volume_pairing_timeout*]
+#   (optional) Sets time in seconds to wait for a migrating volume to complete
+#   paring and sync.
+#   Defaults to $::os_service_default
+#
+# [*sf_api_request_timeout*]
+#   (optional) Sets time in seconds to wait for an api request to complete.
+#   Defaults to $::os_service_default
+#
+# [*sf_volume_clone_timeout*]
+#   (optional) Sets time in seconds to wait for a clone of a volume or snapshot
+#   to complete.
+#   Defaults to $::os_service_default
+#
+# [*sf_volume_create_timeout*]
+#   (optional) Sets time in seconds to wait for a create volume operation to
+#   complete.
+#   Defaults to $::os_service_default
+#
 # [*manage_volume_type*]
 #   (Optional) Whether or not manage Cinder Volume type.
 #   If set to true, a Cinder Volume type will be created
@@ -98,6 +126,12 @@ define cinder::backend::solidfire(
   $sf_volume_prefix           = $::os_service_default,
   $sf_svip                    = $::os_service_default,
   $sf_enable_vag              = $::os_service_default,
+  $sf_provisioning_calc       = $::os_service_default,
+  $sf_cluster_pairing_timeout = $::os_service_default,
+  $sf_volume_pairing_timeout  = $::os_service_default,
+  $sf_api_request_timeout     = $::os_service_default,
+  $sf_volume_clone_timeout    = $::os_service_default,
+  $sf_volume_create_timeout   = $::os_service_default,
   $manage_volume_type         = false,
   $extra_options              = {},
   # DEPRECATED PARAMETERS
@@ -132,6 +166,12 @@ define cinder::backend::solidfire(
     "${name}/sf_volume_prefix":           value => $sf_volume_prefix;
     "${name}/sf_svip":                    value => $sf_svip;
     "${name}/sf_enable_vag":              value => $sf_enable_vag;
+    "${name}/sf_provisioning_calc":       value => $sf_provisioning_calc;
+    "${name}/sf_cluster_pairing_timeout": value => $sf_cluster_pairing_timeout;
+    "${name}/sf_volume_pairing_timeout":  value => $sf_volume_pairing_timeout;
+    "${name}/sf_api_request_timeout":     value => $sf_api_request_timeout;
+    "${name}/sf_volume_clone_timeout":    value => $sf_volume_clone_timeout;
+    "${name}/sf_volume_create_timeout":   value => $sf_volume_create_timeout;
   }
 
   if $manage_volume_type {

releasenotes/notes/solidfire-opts-608d3135644f195e.yaml

@@ -0,0 +1,12 @@
+---
+features:
+  - |
+    The ``cinder::backend::solidfire`` defined type now supports the following
+    new parameters.
+
+    - ``sf_provisioning_calc``
+    - ``sf_cluster_pairing_timeout``
+    - ``sf_volume_pairing_timeout``
+    - ``sf_api_request_timeout``
+    - ``sf_volume_clone_timeout``
+    - ``sf_volume_create_timeout``

spec/defines/cinder_backend_solidfire_spec.rb

@@ -23,6 +23,12 @@ describe 'cinder::backend::solidfire' do
       :sf_volume_prefix           => '<SERVICE DEFAULT>',
       :sf_svip                    => '<SERVICE DEFAULT>',
       :sf_enable_vag              => '<SERVICE DEFAULT>',
+      :sf_provisioning_calc       => '<SERVICE DEFAULT>',
+      :sf_cluster_pairing_timeout => '<SERVICE DEFAULT>',
+      :sf_volume_pairing_timeout  => '<SERVICE DEFAULT>',
+      :sf_api_request_timeout     => '<SERVICE DEFAULT>',
+      :sf_volume_clone_timeout    => '<SERVICE DEFAULT>',
+      :sf_volume_create_timeout   => '<SERVICE DEFAULT>',
     }
   end
 
@@ -36,6 +42,12 @@ describe 'cinder::backend::solidfire' do
       :sf_volume_prefix           => 'UUID-',
       :sf_svip                    => 'svip',
       :sf_enable_vag              => false,
+      :sf_provisioning_calc       => 'maxProvisionedSpace',
+      :sf_cluster_pairing_timeout => 60,
+      :sf_volume_pairing_timeout  => 3600,
+      :sf_api_request_timeout     => 30,
+      :sf_volume_clone_timeout    => 600,
+      :sf_volume_create_timeout   => 60,
     }
   end