Merge "[Pure Storage] Add new FlashArray Cinder driver params"

deployment/cinder/cinder-backend-pure-puppet.yaml

@@ -63,6 +63,8 @@ parameters:
   CinderPureStorageProtocol:
     type: string
     default: 'iSCSI'
+    constraints:
+      - allowed_values: ['iSCSI', 'FC']
   CinderPureSanIp:
     type: string
   CinderPureAPIToken:
@@ -76,6 +78,29 @@ parameters:
   CinderPureImageCache:
     type: boolean
     default: true
+  CinderPureHostPersonality:
+    type: string
+    default: ''
+    constraints:
+      - allowed_values: ['aix', 'esxi', 'hitachi-vsp', 'hpux',
+                         'oracle-vm-server', 'solaris', 'vms', '']
+    description: Determines how the Purity system tunes the protocol
+                 used between the array and the initiator.
+                 A blank string will default to no Host Pesonality.
+  CinderPureIscsiCidr:
+    type: string
+    default: '0.0.0.0/0'
+    description: CIDR of FlashArray iSCSI targets hosts are allowed
+                 to connect to. Default is any valid IPv4 address.
+  CinderPureEradicateOnDelete:
+    type: boolean
+    default: false
+    description: When enabled, all Pure volumes, snapshots, and
+                 protection groups will be eradicated at the time of
+                 deletion in Cinder. Data will NOT be recoverable after
+                 a delete with this set to True! When disabled, volumes
+                 and snapshots will go into pending eradication state.
+                 and can be recovered.
 
 outputs:
   role_data:
@@ -93,6 +118,11 @@ outputs:
             cinder::backend::pure::use_chap_auth: {get_param: CinderPureUseChap}
             cinder::backend::pure::use_multipath_for_image_xfer: {get_param: CinderPureMultipathXfer}
             cinder::backend::pure::image_volume_cache_enabled : {get_param: CinderPureImageCache}
+            cinder::backend::pure::pure_eradicate_on_delete : {get_param: CinderPureEradicateOnDelete}
+            cinder::backend::pure::pure_iscsi_cidr : {get_param: CinderPureIscsiCidr}
           - if:
             - not: {equals : [{get_param: CinderPureAvailabilityZone}, '']}
             - cinder::backend::pure::backend_availability_zone: {get_param: CinderPureAvailabilityZone}
+          - if:
+            - not: {equals : [{get_param: CinderPureHostPersonality}, '']}
+            - cinder::backend::pure::pure_host_personality: {get_param: CinderPureHostPersonality}

environments/cinder-pure-config.yaml

@@ -15,6 +15,9 @@ parameter_defaults:
   CinderPureUseChap: false
   CinderPureMultipathXfer: true
   CinderPureImageCache: true
+  CinderPureHostPersonality: ''
+  CinderPureEradicateOnDelete: false
+  CinderPureIscsiCidr: ''
 
 # To configure multiple Pure backends, use CinderPureMultiConfig to
 # assign parameter values specific to that backend. For example:

releasenotes/notes/pure_storage_update_params-4de801b1ed2d0744.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Added ``pure_iscsi_cidr`` and ``pure_host_personality``
+    and ``eradicate_on_delete`` support for the Pure Storage
+    FlashArray Cinder driver.