commit 87fe1207b847f10cc3a1916fdf4d7da441f9e974
author Mohammed Naser <mnaser@vexxhost.com> Mon Apr 29 19:48:02 2024 -0400
committer GitHub <noreply@github.com> Mon Apr 29 23:48:02 2024 +0000
tree 4b32d410c90aa5207d2908119d9ddbd070a27868
parent 90128aa61b10c45b7e6a88562b9a8f2b6faf7d0e

Add updated Storpool drivers to images (#1150)

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

images/cinder/Dockerfile

diff --git a/images/cinder/Dockerfile b/images/cinder/Dockerfile
index 9c7298b..1487042 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/bobcat/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/bobcat/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 9b77fd3..7171659 100644
--- a/images/glance/Dockerfile
+++ b/images/glance/Dockerfile
@@ -24,8 +24,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/bobcat/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 968c013..2641a7a 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/bobcat/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