From 60c3f949004b47aa2aa25e47a8de5ccd32b08515 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Sat, 15 Feb 2025 09:59:54 -0600 Subject: [PATCH 1/2] 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 --- .github/workflows/release-neutron-oslodb.yaml | 13 +++++++++---- Containerfiles/Neutron-oslo_db-Containerfile | 5 ++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-neutron-oslodb.yaml b/.github/workflows/release-neutron-oslodb.yaml index 77d9f89a6..e3779a9f3 100644 --- a/.github/workflows/release-neutron-oslodb.yaml +++ b/.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 diff --git a/Containerfiles/Neutron-oslo_db-Containerfile b/Containerfiles/Neutron-oslo_db-Containerfile index 259d07c46..45a9647cd 100644 --- a/Containerfiles/Neutron-oslo_db-Containerfile +++ b/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/ From a6d80834e2a4555a4edae5a390a2cfc60cfd050a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Feb 2025 16:04:35 +0000 Subject: [PATCH 2/2] Update original images with new container --- .original-images.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.original-images.json b/.original-images.json index cda207e60..7f91b26cd 100644 --- a/.original-images.json +++ b/.original-images.json @@ -4,6 +4,7 @@ "docker.io/openstackhelm/glance:2024.1-ubuntu_jammy", "docker.io/openstackhelm/magnum:2024.1-ubuntu_jammy", "docker.io/openstackhelm/neutron:2024.1-ubuntu_jammy", + "ghcr.io/cloudnull/genestack/neutron-oslodb:2024.1-ubuntu_jammy-1739635397", "ghcr.io/rackerlabs/genestack/ceilometer:2024.1-ubuntu_jammy-1738626813", "ghcr.io/rackerlabs/genestack/cinder-volume-rxt:2024.1-ubuntu_jammy-1731085441", "ghcr.io/rackerlabs/genestack/cinder:2024.1-ubuntu_jammy-1738626871",