commit d61f3d4fb014b07848e6b8d04698110b2fe16f97
author Mohammed Naser <mnaser@vexxhost.com> Wed Apr 24 00:32:54 2024 -0400
committer GitHub <noreply@github.com> Wed Apr 24 04:32:54 2024 +0000
tree 54ee8964680bf4c814ef640f2f96e1858833755f
parent c410422d9d9374c752f6700ff3633d1141c74ad7

[stable/zed] Add updated Storpool drivers to images (#1155)

Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>

images/cinder/Dockerfile

diff --git a/images/cinder/Dockerfile b/images/cinder/Dockerfile
index 07f2ac52..fe1f3c3 100644
--- a/images/cinder/Dockerfile
+++ b/images/cinder/Dockerfile
@@ -24,8 +24,16 @@
 pip3 install \
     --constraint /upper-constraints.txt \
         /src/cinder \
-        purestorage
+        purestorage \
+        storpool \
+        storpool.spopenstack
 EOF
+ADD --chmod=644 \
+    https://github.com/storpool/storpool-openstack-integration/raw/master/drivers/cinder/openstack/zed/storpool.py \
+    /var/lib/openstack/lib/python3.10/site-packages/cinder/volume/drivers/storpool.py
+ADD --chmod=644 \
+    https://github.com/storpool/storpool-openstack-integration/raw/master/drivers/os_brick/openstack/zed/storpool.py \
+    /var/lib/openstack/lib/python3.10/site-packages/os_brick/initiator/connectors/storpool.py
 
 FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe

images/glance/Dockerfile

diff --git a/images/glance/Dockerfile b/images/glance/Dockerfile
index dae55ee..3e1756c 100644
--- a/images/glance/Dockerfile
+++ b/images/glance/Dockerfile
@@ -26,8 +26,13 @@
 pip3 install \
     --constraint /upper-constraints.txt \
         /src/glance \
-        /src/glance_store[cinder]
+        /src/glance_store[cinder] \
+        storpool \
+        storpool.spopenstack
 EOF
+ADD --chmod=644 \
+    https://github.com/storpool/storpool-openstack-integration/raw/master/drivers/os_brick/openstack/zed/storpool.py \
+    /var/lib/openstack/lib/python3.10/site-packages/os_brick/initiator/connectors/storpool.py
 
 FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe

images/nova/Dockerfile

diff --git a/images/nova/Dockerfile b/images/nova/Dockerfile
index 415034c..6921c3a 100644
--- a/images/nova/Dockerfile
+++ b/images/nova/Dockerfile
@@ -21,8 +21,13 @@
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip,sharing=private <<EOF bash -xe
 pip3 install \
     --constraint /upper-constraints.txt \
-        /src/nova
+        /src/nova \
+        storpool \
+        storpool.spopenstack
 EOF
+ADD --chmod=644 \
+    https://github.com/storpool/storpool-openstack-integration/raw/master/drivers/os_brick/openstack/zed/storpool.py \
+    /var/lib/openstack/lib/python3.10/site-packages/os_brick/initiator/connectors/storpool.py
 
 FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 ADD https://github.com/novnc/noVNC.git#v1.4.0 /usr/share/novnc