diff --git a/Dockerfile.base b/Dockerfile.base index f418147fa5..7a9d85f4f1 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -31,9 +31,9 @@ RUN INSTALL_PKGS="iptables nftables" && \ ovnver_short=$(echo "$ovnver" | cut -d'.' -f1,2) && \ dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs $INSTALL_PKGS && \ dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs "openvswitch$ovsver" "python3-openvswitch$ovsver" && \ - dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs "ovn$ovnver_short = $ovnver" "ovn$ovnver_short-central = $ovnver" "ovn$ovnver_short-host = $ovnver" && \ + dnf --setopt=retries=2 --setopt=timeout=2 install -y --nodocs "ovn$ovnver_short" "ovn$ovnver_short-central" "ovn$ovnver_short-host" && \ dnf clean all && rm -rf /var/cache/* && \ - sed 's/%/"/g' <<<"%openvswitch$ovsver-devel% %openvswitch$ovsver-ipsec% %ovn$ovnver_short-vtep = $ovnver%" > /more-pkgs + sed 's/%/"/g' <<<"%openvswitch$ovsver-devel% %openvswitch$ovsver-ipsec% %ovn$ovnver_short-vtep%" > /more-pkgs RUN mkdir -p /var/run/openvswitch && \ mkdir -p /var/run/ovn && \ @@ -50,5 +50,12 @@ COPY .git/refs/heads/ /root/.git/refs/heads/ # variables to direct operation and configure ovn COPY dist/images/ovnkube.sh /root/ +# Copy and install custom OVS/OVN RPMs. +RUN mkdir -p /root/fdp/ +COPY *fdp.*.rpm /root/fdp/ +RUN dnf install -y 'dnf-command(versionlock)' +RUN dnf install -y /root/fdp/*.rpm +RUN dnf versionlock add python3-openvswitch* openvswitch* ovn* + WORKDIR /root ENTRYPOINT /root/ovnkube.sh diff --git a/ovn24.03-24.03.6-54.el9fdp.x86_64.rpm b/ovn24.03-24.03.6-54.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..db61c06033 Binary files /dev/null and b/ovn24.03-24.03.6-54.el9fdp.x86_64.rpm differ diff --git a/ovn24.03-central-24.03.6-54.el9fdp.x86_64.rpm b/ovn24.03-central-24.03.6-54.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..767a952fdc Binary files /dev/null and b/ovn24.03-central-24.03.6-54.el9fdp.x86_64.rpm differ diff --git a/ovn24.03-host-24.03.6-54.el9fdp.x86_64.rpm b/ovn24.03-host-24.03.6-54.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..d390fb145e Binary files /dev/null and b/ovn24.03-host-24.03.6-54.el9fdp.x86_64.rpm differ diff --git a/ovn24.03-vtep-24.03.6-54.el9fdp.x86_64.rpm b/ovn24.03-vtep-24.03.6-54.el9fdp.x86_64.rpm new file mode 100644 index 0000000000..4052d29ed6 Binary files /dev/null and b/ovn24.03-vtep-24.03.6-54.el9fdp.x86_64.rpm differ