Merge pull request #1042 from rackerlabs/build-cinder-container

feat: initial cinder plugin and cinder container with plugin

Author: cardoe

.github/workflows/build-container-images.yaml

@@ -43,7 +43,7 @@ jobs:
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
         with:
           context: containers/python311_alpine/
-          file: containers/python311_alpine/Dockerfile.python311_alpine
+          file: containers/python311_alpine/Dockerfile
           # push for all main branch commits
           push: ${{ github.event_name != 'pull_request' }}
           tags: ghcr.io/${{ github.repository }}/argo-python3.11.8-alpine3.19:latest,ghcr.io/${{ github.repository }}/argo-python3.11.8-alpine3.19:${{ env.VERSION_PYTHON311 }}
@@ -54,7 +54,7 @@ jobs:
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
         with:
           context: containers/python312_alpine/
-          file: containers/python312_alpine/Dockerfile.python312_alpine
+          file: containers/python312_alpine/Dockerfile
           # push for all main branch commits
           push: ${{ github.event_name != 'pull_request' }}
           tags: ghcr.io/${{ github.repository }}/argo-python3.12.2-alpine3.19:latest,ghcr.io/${{ github.repository }}/argo-python3.12.2-alpine3.19:${{ env.VERSION_PYTHON312 }}

.github/workflows/containers.yaml

@@ -33,7 +33,7 @@ jobs:
     strategy:
       matrix:
         # if you add a container here, add it to the 'clean_containers' job below
-        project: [ironic, neutron, keystone, nova, openstack-client]
+        project: [ironic, neutron, keystone, nova, openstack-client, cinder]
 
     steps:
       - name: setup docker buildx
@@ -66,7 +66,7 @@ jobs:
       - name: build and deploy openstack container image to registry
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
         with:
-          file: containers/${{ matrix.project }}/Dockerfile.${{ matrix.project }}
+          file: containers/${{ matrix.project }}/Dockerfile
           build-args: OPENSTACK_VERSION=${{ env.OPENSTACK_VERSION }}
           pull: true  # ensure we always have an up to date source
           push: true
@@ -110,7 +110,7 @@ jobs:
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
         with:
           context: "{{defaultContext}}:containers/dnsmasq"
-          file: Dockerfile.dnsmasq
+          file: Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -159,7 +159,7 @@ jobs:
       - name: build and deploy container image to registry
         uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
         with:
-          file: containers/${{ matrix.container.name }}/Dockerfile.${{ matrix.container.name }}
+          file: containers/${{ matrix.container.name }}/Dockerfile
           pull: true  # ensure we always have an up to date source
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.pre-commit-config.yaml

@@ -63,6 +63,9 @@ repos:
     # uv version.
     rev: 0.7.13
     hooks:
+      - id: uv-lock
+        name: cinder-understack
+        args: ["-D", "python/cinder-understack"]
       - id: uv-lock
         name: diff-nautobot-understack
         args: ["-D", "python/diff-nautobot-understack"]

components/images-openstack.yaml

@@ -90,4 +90,15 @@ images:
     # skyline
     skyline: "quay.io/airshipit/skyline:latest"
     skyline_db_sync: "quay.io/airshipit/skyline:latest"
+
+    # cinder
+    cinder_api: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
+    cinder_db_sync: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
+    cinder_scheduler: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
+    cinder_volume: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
+    cinder_volume_usage_audit: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
+    cinder_db_purge: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
+    cinder_backup: "ghcr.io/rackerlabs/understack/cinder:2024.2-ubuntu_jammy"
+    cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
+    cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy"
 ...

containers/ansible/Dockerfile.ansible renamed to containers/ansible/Dockerfile

@@ -0,0 +1,18 @@
+# syntax=docker/dockerfile:1
+
+ARG OPENSTACK_VERSION="required_argument"
+FROM docker.io/openstackhelm/cinder:${OPENSTACK_VERSION}-ubuntu_jammy AS builder
+
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
+
+COPY python/cinder-understack /tmp/cinder-understack
+
+RUN --mount=type=cache,target=/root/.cache/uv \
+    cd /tmp/cinder-understack && \
+    uv build --wheel --out-dir /tmp/wheels/
+
+FROM docker.io/openstackhelm/cinder:${OPENSTACK_VERSION}-ubuntu_jammy AS final
+
+RUN --mount=type=cache,target=/root/.cache/pip \
+    --mount=from=builder,source=/tmp/wheels,target=/tmp/wheels \
+    /var/lib/openstack/bin/python -m pip install --no-input --find-links /tmp/wheels/ cinder-understack