feat: upgrade to bobcat (#887)
diff --git a/images/manila/Earthfile b/images/manila/Earthfile
index 320fc8f..5718142 100644
--- a/images/manila/Earthfile
+++ b/images/manila/Earthfile
@@ -1,17 +1,20 @@
VERSION 0.7
+ARG --global PROJECT=manila
+ARG --global RELEASE=2023.2
+ARG --global PROJECT_REF=98bc755673fe48a9c67203e4262315b048efe25d
+
+build:
+ FROM ../openstack-service+builder --RELEASE=${RELEASE}
+ DO ../openstack-service+BUILD_VENV \
+ --PROJECT=${PROJECT} \
+ --PROJECT_REF=${PROJECT_REF}
+
image:
- ARG PROJECT=manila
- ARG RELEASE=zed
- ARG REF=9ea49e2b9df7da16d5700810eee18710dc90e6a4
- FROM ../openstack-service+image \
- --PROJECT ${PROJECT} \
- --RELEASE ${RELEASE} \
- --PROJECT_REF ${REF}
- DO \
- ../+APT_INSTALL \
+ FROM ../openstack-service+image --RELEASE ${RELEASE} --PROJECT ${PROJECT}
+ COPY +build/venv /var/lib/openstack
+ DO ../+APT_INSTALL \
--PACKAGES "iproute2 openvswitch-switch"
- DO ../+APPLY_PATCHES
SAVE IMAGE --push \
ghcr.io/vexxhost/atmosphere/${PROJECT}:${RELEASE} \
- ghcr.io/vexxhost/atmosphere/${PROJECT}:${REF}
+ ghcr.io/vexxhost/atmosphere/${PROJECT}:${PROJECT_REF}
diff --git a/images/manila/patches/0000-fix-stop-using-batch_op-for-rename_table.patch b/images/manila/patches/manila/0000-fix-stop-using-batch_op-for-rename_table.patch
similarity index 80%
rename from images/manila/patches/0000-fix-stop-using-batch_op-for-rename_table.patch
rename to images/manila/patches/manila/0000-fix-stop-using-batch_op-for-rename_table.patch
index a55e4e6..c904b26 100644
--- a/images/manila/patches/0000-fix-stop-using-batch_op-for-rename_table.patch
+++ b/images/manila/patches/manila/0000-fix-stop-using-batch_op-for-rename_table.patch
@@ -1,6 +1,6 @@
From eb7f03c667261557d7f809f7851bad6b3eea4646 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
-Date: Mon, 08 Jan 2024 14:00:37 -0500
+Date: Mon, 8 Jan 2024 14:00:37 -0500
Subject: [PATCH] fix: Stop using batch_op for rename_table
For migrations that rename tables, batch_op is not needed, which
@@ -8,12 +8,14 @@
Change-Id: Ib43f5a24c497f7d97cb2d852b99489b0c3bd75fb
---
+ .../alembic/versions/5077ffcc5f1c_add_share_instances.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/manila/db/migrations/alembic/versions/5077ffcc5f1c_add_share_instances.py b/manila/db/migrations/alembic/versions/5077ffcc5f1c_add_share_instances.py
-index 42d26b7..373e308 100644
+index 42d26b75e..373e308d0 100644
--- a/manila/db/migrations/alembic/versions/5077ffcc5f1c_add_share_instances.py
+++ b/manila/db/migrations/alembic/versions/5077ffcc5f1c_add_share_instances.py
-@@ -245,8 +245,8 @@
+@@ -245,8 +245,8 @@ def upgrade_export_locations_table(connection):
with op.batch_alter_table("share_export_locations") as batch_op:
batch_op.drop_constraint('sel_id_fk', type_='foreignkey')
batch_op.drop_column('share_id')
@@ -24,3 +26,6 @@
def downgrade_export_locations_table(connection):
+--
+2.34.1
+