From d9993ce37b887da569c9e613d273205aaf330987 Mon Sep 17 00:00:00 2001
From: Simon Dodsley <simon@purestorage.com>
Date: Thu, 29 Dec 2022 10:17:35 -0500
Subject: [PATCH] [Pure Storage] Add NVMe transport parameter for FlashArray
 Cinder driver

Depends-On: I7e1172b3048e6bf84be7dad4d193f10e9b15138e
Depends-On: I3535b6861411a880f788e0620140067d21e6e563
Change-Id: I37e84017926baa0db31271c32400938ee53fb3d2
(cherry picked from commit 2e32a8dd97fdf7b3bfdabb9ddc8259b8854275ee)
---
 manifests/profile/base/cinder/volume/pure.pp       | 6 ++++++
 releasenotes/notes/pure_nvme-02263cb67d33e7f4.yaml | 7 +++++++
 2 files changed, 13 insertions(+)
 create mode 100644 releasenotes/notes/pure_nvme-02263cb67d33e7f4.yaml

diff --git a/manifests/profile/base/cinder/volume/pure.pp b/manifests/profile/base/cinder/volume/pure.pp
index f179a7543..ecfaed55b 100644
--- a/manifests/profile/base/cinder/volume/pure.pp
+++ b/manifests/profile/base/cinder/volume/pure.pp
@@ -50,6 +50,9 @@ class tripleo::profile::base::cinder::volume::pure (
       'CinderPureIscsiCidr'          => lookup('cinder::backend::pure::pure_iscsi_cidr', undef, undef, undef),
       'CinderPureHostPersonality'    => lookup('cinder::backend::pure::pure_host_personality', undef, undef, undef),
       'CinderPureEradicateOnDelete'  => lookup('cinder::backend::pure::pure_eradicate_on_delete', undef, undef, undef),
+      'CinderPureNvmeTransport'      => lookup('cinder::backend::pure::pure_nvme_transport', undef, undef, undef),
+      'CinderPureNvmeCidr'           => lookup('cinder::backend::pure::pure_nvme_cidr', undef, undef, undef),
+      'CinderPureNvmeCidrList'       => lookup('cinder::backend::pure::pure_nvme_cidr_list', undef, undef, undef),
     }
 
     $backend_name.each |String $backend| {
@@ -66,6 +69,9 @@ class tripleo::profile::base::cinder::volume::pure (
         'pure_iscsi_cidr'              => $backend_config['CinderPureIscsiCidr'],
         'pure_host_personality'        => $backend_config['CinderPureHostPersonality'],
         'pure_eradicate_on_delete'     => $backend_config['CinderPureEradicateOnDelete'],
+        'pure_nvme_transport'          => $backend_config['CinderPureNvmeTransport'],
+        'pure_nvme_cidr'               => $backend_config['CinderPureNvmeCidr'],
+        'pure_nvme_cidr_list'          => $backend_config['CinderPureNvmeCidrList'],
       })})
     }
   }
diff --git a/releasenotes/notes/pure_nvme-02263cb67d33e7f4.yaml b/releasenotes/notes/pure_nvme-02263cb67d33e7f4.yaml
new file mode 100644
index 000000000..091a6898b
--- /dev/null
+++ b/releasenotes/notes/pure_nvme-02263cb67d33e7f4.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Add support for NVME transport protocol for Pure Storage
+    FlashArray Cinder Backend.
+    Add support for NVMe CIDR and NVMe CIDR list parameters
+    for Pure Storage FlashArray Cinder Backend.