fix: Rebuilds neutron to ensure sync compatibility

This change will ensure that our version of Neutron is allowing operators
to execute with an additive sync model. Additive sync ensures that we can
protect the OVN DB while also ensuring that Neutron is able to automatically
resolve issues when they arrive.

Signed-off-by: Kevin Carter <[email protected]>

Author: cloudnull

.github/workflows/release-neutron-oslodb.yaml

@@ -12,8 +12,6 @@ on:
         type: choice
         options:
           - master-ubuntu_jammy
-          - 2023.1-ubuntu_jammy
-          - 2023.2-ubuntu_jammy
           - 2024.1-ubuntu_jammy
       pluginTag:
         description: 'Set release used for the build environment'
@@ -22,9 +20,15 @@ on:
         type: choice
         options:
           - "master"
-          - "2023.1"
-          - "2023.2"
           - "2024.1"
+      NeutronTag:
+        description: 'Set Neutron version'
+        required: true
+        default: 'sync-add-mode-2024.1'
+        type: choice
+        options:
+          - 'master'
+          - 'sync-add-mode-2024.1'
 
 # Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
 env:
@@ -76,6 +80,7 @@ jobs:
           build-args: |
             VERSION=${{ github.event.inputs.imageTag }}
             PLUGIN_VERSION=${{ github.event.inputs.pluginTag }}
+            NEUTRON_VERSION=${{ github.event.inputs.NeutronTag }}
       - name: Dynamically set MY_CONTAINER output option
         id: mycontainer
         run: echo "MY_CONTAINER=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/neutron-oslodb:${{ github.event.inputs.imageTag }}-${{ env.MY_DATE }}" >> $GITHUB_OUTPUT

Containerfiles/Neutron-oslo_db-Containerfile

@@ -2,11 +2,14 @@
 ARG VERSION=master-ubuntu_jammy
 FROM openstackhelm/neutron:$VERSION as build
 ARG PLUGIN_VERSION=master
+ARG NEUTRON_VERSION=master
 RUN apt update && apt install -y git
 RUN export ORIG_PLUGIN_VERSION="${PLUGIN_VERSION}"; \
 if [ "${PLUGIN_VERSION}" != 'master' ]; then export PLUGIN_VERSION=stable/${PLUGIN_VERSION}; fi; \
 . /var/lib/openstack/bin/activate; \
-/var/lib/openstack/bin/pip install git+https://github.com/openstack/oslo.db@${PLUGIN_VERSION}#egg=oslo_db
+/var/lib/openstack/bin/pip install --upgrade \
+git+https://github.com/openstack/oslo.db@${PLUGIN_VERSION}#egg=oslo_db \
+git+https://github.com/rackerlabs/neutron@${NEUTRON_VERSION}#egg=neutron
 
 FROM openstackhelm/neutron:${VERSION}
 COPY --from=build /var/lib/openstack/. /var/lib/openstack/