From bb89515468a7cb771227eed98b33b6b771f2744e Mon Sep 17 00:00:00 2001
From: Simon Dodsley <simon@purestorage.com>
Date: Fri, 5 Nov 2021 08:38:18 -0400
Subject: [PATCH] [Pure Storage] Add new params for FlashArray Cinder driver

Depends-On: Ia48fa3fa8ce3a3563fdab0966dc5a44f30248bc8
Change-Id: I9ab50d6c0835ea69044249f1cbbbf10f9b6a2498
---
 manifests/profile/base/cinder/volume/pure.pp  | 20 ++++++++++++-------
 ...update_cinder_params-94940d1d3ca46877.yaml |  6 ++++++
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 releasenotes/notes/pure_storage_update_cinder_params-94940d1d3ca46877.yaml

diff --git a/manifests/profile/base/cinder/volume/pure.pp b/manifests/profile/base/cinder/volume/pure.pp
index 9d657d32d..d0c541f9d 100644
--- a/manifests/profile/base/cinder/volume/pure.pp
+++ b/manifests/profile/base/cinder/volume/pure.pp
@@ -40,13 +40,16 @@ class tripleo::profile::base::cinder::volume::pure (
 
   if $step >= 4 {
     $backend_defaults = {
-      'CinderPureAvailabilityZone' => hiera('cinder::backend::pure::backend_availability_zone', undef),
-      'CinderPureSanIp'            => hiera('cinder::backend::pure::san_ip', undef),
-      'CinderPureAPIToken'         => hiera('cinder::backend::pure::pure_api_token', undef),
-      'CinderPureStorageProtocol'  => hiera('cinder::backend::pure::pure_storage_protocol', undef),
-      'CinderPureUseChap'          => hiera('cinder::backend::pure::use_chap_auth', undef),
-      'CinderPureMultipathXfer'    => hiera('cinder::backend::pure::use_multipath_for_image_xfer', undef),
-      'CinderPureImageCache'       => hiera('cinder::backend::pure::image_volume_cache_enabled', undef),
+      'CinderPureAvailabilityZone'   => hiera('cinder::backend::pure::backend_availability_zone', undef),
+      'CinderPureSanIp'              => hiera('cinder::backend::pure::san_ip', undef),
+      'CinderPureAPIToken'           => hiera('cinder::backend::pure::pure_api_token', undef),
+      'CinderPureStorageProtocol'    => hiera('cinder::backend::pure::pure_storage_protocol', undef),
+      'CinderPureUseChap'            => hiera('cinder::backend::pure::use_chap_auth', undef),
+      'CinderPureMultipathXfer'      => hiera('cinder::backend::pure::use_multipath_for_image_xfer', undef),
+      'CinderPureImageCache'         => hiera('cinder::backend::pure::image_volume_cache_enabled', undef),
+      'CinderPureIscsiCidr'          => hiera('cinder::backend::pure::pure_iscsi_cidr', undef),
+      'CinderPureHostPersonality'    => hiera('cinder::backend::pure::pure_host_personality', undef),
+      'CinderPureEradicateOnDelete'  => hiera('cinder::backend::pure::pure_eradicate_on_delete', undef),
     }
 
     $backend_name.each |String $backend| {
@@ -60,6 +63,9 @@ class tripleo::profile::base::cinder::volume::pure (
         'use_chap_auth'                => $backend_config['CinderPureUseChap'],
         'use_multipath_for_image_xfer' => $backend_config['CinderPureMultipathXfer'],
         'image_volume_cache_enabled'   => $backend_config['CinderPureImageCache'],
+        'pure_iscsi_cidr'              => $backend_config['CinderPureIscsiCidr'],
+        'pure_host_personality'        => $backend_config['CinderPureHostPersonality'],
+        'pure_eradicate_on_delete'     => $backend_config['CinderPureEradicateOnDelete'],
       })})
     }
   }
diff --git a/releasenotes/notes/pure_storage_update_cinder_params-94940d1d3ca46877.yaml b/releasenotes/notes/pure_storage_update_cinder_params-94940d1d3ca46877.yaml
new file mode 100644
index 000000000..2d6f640c6
--- /dev/null
+++ b/releasenotes/notes/pure_storage_update_cinder_params-94940d1d3ca46877.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Added support for host personality, iSCSI CIDR and
+    eradicate on delete parameters for Pure Storage
+    FlashArray Cinder backend.