From f67eae51f93ea05e9cd8f956e5aef2b3bf84d7db Mon Sep 17 00:00:00 2001
From: Simon Dodsley <simon@purestorage.com>
Date: Fri, 30 Jul 2021 10:36:56 -0400
Subject: [PATCH] [Pure Storage] Resolve missing provider_id issue (PowerVC)

In PowerVC, cloning of multiple volumes fails due to the
provider_id not being populated correctly for a volume.

Change-Id: Ib08a0561aa404a7aee41b23ec5d30f9f52096687
Closes-Bug: #1938579
---
 cinder/volume/drivers/pure.py                               | 1 +
 ...fix_clone_provider_id_powervc.yaml-e794f05b0cd90f45.yaml | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 releasenotes/notes/pure_storage_fix_clone_provider_id_powervc.yaml-e794f05b0cd90f45.yaml

diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py
index cdc3f41be8e..f28e7183643 100644
--- a/cinder/volume/drivers/pure.py
+++ b/cinder/volume/drivers/pure.py
@@ -446,6 +446,7 @@ class PureBaseVolumeDriver(san.SanDriver):
         vol_updates = []
         for vol in volumes:
             if not vol.provider_id:
+                vol.provider_id = self._get_vol_name(vol)
                 vol_updates.append({
                     'id': vol.id,
                     'provider_id': self._generate_purity_vol_name(vol),
diff --git a/releasenotes/notes/pure_storage_fix_clone_provider_id_powervc.yaml-e794f05b0cd90f45.yaml b/releasenotes/notes/pure_storage_fix_clone_provider_id_powervc.yaml-e794f05b0cd90f45.yaml
new file mode 100644
index 00000000000..1f864ba30a9
--- /dev/null
+++ b/releasenotes/notes/pure_storage_fix_clone_provider_id_powervc.yaml-e794f05b0cd90f45.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Pure Storage FlashArray driver `bug #1938579
+    <https://bugs.launchpad.net/cinder/+bug/1938579>`_: Fixes issue when
+    cloning multiple volumes in PowerVC deployments.