diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-07-06 15:26:00 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-07-06 19:59:40 +0000 |
| commit | db35ac8d793506bc43b62e7e39d27a75de1043ed (patch) | |
| tree | feec28d13a43490f5fd4260374144a1abfc20331 /docker/neutron | |
| parent | 1ae1850557e3b99902f73b32c9005618537a1f2d (diff) | |
| download | kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.tar.gz kolla-db35ac8d793506bc43b62e7e39d27a75de1043ed.zip | |
Migrate to pyproject.toml
[tool.setuptools.data-files] does not support recursive directory
installation. The old setup.cfg [files] worked because PBR's
FilesConfig.expand_globs() used os.walk() to expand docker/*, but
this hook is not triggered by the pbr.build PEP-517 backend.
Move docker/ into kolla/ and use [tool.setuptools.package-data]
instead. Update kolla_worker._get_images_dir() to check the kolla
package directory first so both editable and regular installs work.
Change-Id: I4fc452c03740ef22ebbb4e8d0d86c4f4783e2d09
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/neutron')
25 files changed, 0 insertions, 751 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 deleted file mode 100644 index e91c1e6e6..000000000 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ /dev/null @@ -1,104 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block neutron_base_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.enable_extra_repos(['docker-ce']) }} -{{ macros.configure_user(name='neutron') }} - -{% if base_package_type == 'rpm' %} - -{{ macros.enable_extra_repos(['openvswitch']) }} - - {% set neutron_base_packages = [ - 'conntrack-tools', - 'dnsmasq', - 'dnsmasq-utils', - 'docker-ce-cli', - 'haproxy', - 'iproute-tc', - 'ipset', - 'iptables', - 'iputils', - 'keepalived', - 'net-tools', - 'openvswitch${KOLLA_RPM_OVS_VERSION}', - 'python3-openvswitch${KOLLA_RPM_OVS_VERSION}', - 'radvd', - 'uuid' - ] %} - -{% elif base_package_type == 'deb' %} - - {% set neutron_base_packages = [ - 'conntrack', - 'dnsmasq', - 'dnsmasq-utils', - 'docker-ce-cli', - 'haproxy', - 'iproute2', - 'ipset', - 'iptables', - 'iputils-arping', - 'iputils-ping', - 'keepalived', - 'net-tools', - 'openvswitch-switch', - 'python3-openvswitch', - 'radvd', - 'uuid-runtime' - ] %} - -{% endif %} - -{{ macros.install_packages(neutron_base_packages | customizable("packages")) }} - -ADD neutron-base-archive /neutron-base-source -ADD plugins-archive / - -{% set neutron_base_pip_packages = [ - '/neutron', - 'oslo-vmware', - 'tap-as-a-service' -] %} - -{% set neutron_base_plugins_pip_packages = [ - '/plugins/*' -] %} - -COPY neutron_sudoers /etc/sudoers.d/kolla_neutron_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN mkdir -p /usr/local/lib/neutron-wrappers /usr/local/etc/neutron-wrappers -COPY dnsmasq haproxy keepalived neutron-keepalived-state-change radvd copy-wrappers delete-wrappers /usr/local/lib/neutron-wrappers/ -RUN chmod +x /usr/local/lib/neutron-wrappers/copy-wrappers \ - && chmod +x /usr/local/lib/neutron-wrappers/delete-wrappers - -RUN ln -s neutron-base-source/* neutron \ - && {{ macros.upper_constraints_remove('networking-generic-switch') }} \ - && {{ macros.install_pip(neutron_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/neutron \ - && cp -r /neutron/etc/* /etc/neutron/ \ - && cp -r /neutron/etc/neutron/* /etc/neutron/ \ - && cp /var/lib/kolla/venv/etc/pycadf/neutron_api_audit_map.conf /etc/neutron/ \ - && mv /etc/neutron/neutron/ /etc/neutron/plugins/ \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/neutron/rootwrap.conf \ - && if [ "$(ls /plugins)" ]; then \ - {{ macros.install_pip(neutron_base_plugins_pip_packages) }} \ - && for neutron_plugins in $(ls /plugins); do \ - if [ -d "/plugins/$neutron_plugins/etc/neutron/rootwrap.d" ]; then \ - cp /plugins/$neutron_plugins/etc/neutron/rootwrap.d/* /etc/neutron/rootwrap.d; \ - fi; \ - done; \ - fi \ - && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_neutron_sudoers \ - && touch /usr/local/bin/kolla_neutron_extend_start \ - && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_neutron_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block neutron_base_footer %}{% endblock %} diff --git a/docker/neutron/neutron-base/copy-wrappers b/docker/neutron/neutron-base/copy-wrappers deleted file mode 100644 index e03bdfdf7..000000000 --- a/docker/neutron/neutron-base/copy-wrappers +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -for binary in dnsmasq haproxy keepalived neutron-keepalived-state-change radvd; do - cp /usr/local/lib/neutron-wrappers/${binary} /usr/local/bin/${binary} - chmod +x /usr/local/bin/${binary} -done - -echo "KOLLA_IMAGE=${KOLLA_IMAGE}" > /usr/local/etc/neutron-wrappers/config -echo "KOLLA_NAME=${KOLLA_NAME}" >> /usr/local/etc/neutron-wrappers/config -echo "KOLLA_SERVICE_NAME=${KOLLA_SERVICE_NAME}" >> /usr/local/etc/neutron-wrappers/config diff --git a/docker/neutron/neutron-base/delete-wrappers b/docker/neutron/neutron-base/delete-wrappers deleted file mode 100644 index 239d977f2..000000000 --- a/docker/neutron/neutron-base/delete-wrappers +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -for binary in dnsmasq haproxy keepalived neutron-keepalived-state-change radvd; do - rm -f /usr/local/bin/${binary} -done - -rm -f /usr/local/etc/neutron-wrappers/config diff --git a/docker/neutron/neutron-base/dnsmasq b/docker/neutron/neutron-base/dnsmasq deleted file mode 100644 index 44b73f0b2..000000000 --- a/docker/neutron/neutron-base/dnsmasq +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -source /usr/local/etc/neutron-wrappers/config - -ARGS="$@" - -# Extract the network namespace UUID from the command line args provided by -# neutron. Typically of the form (with dnsmasq as an example): -# -# dnsmasq --no-hosts --no-resolv --except-interface=lo \ -# --pid-file=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/pid \ -# --dhcp-hostsfile=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/host ... -NETNS=$(ip netns identify) -NAME=${KOLLA_NAME}_dnsmasq_${NETNS} - -if [[ -S "/var/run/docker.sock" ]]; then - CLI="docker" - CMD="ip netns exec ${NETNS} /usr/sbin/dnsmasq -k" -elif [[ -S "/run/podman/podman.sock" ]]; then - CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t1 podman" - CMD="/usr/sbin/dnsmasq -k" -else - echo "Could not detect a supported container runtime, exiting." - exit 1 -fi - -LIST=$($CLI ps -a --filter name=${SERVICE}_dnsmasq_ --format '{{.ID}}:{{.Names}}:{{.Status}}' | awk '{print $1}') - -# If the NAME is already taken by a container, give it an unique name -printf "%s\n" "${LIST}" | grep -q "${NAME}$" && NAME="${NAME}_$(date +%Y-%m-%d-%H%M%S-%N)" - -echo "Starting a new child container ${NAME} using image ${KOLLA_IMAGE}" -$CLI run --rm --detach \ - -v /etc/kolla/${KOLLA_SERVICE_NAME}:/etc/neutron:ro \ - -v /run/netns:/run/netns:shared \ - -v neutron_metadata_socket:/var/lib/neutron/kolla/ \ - -v kolla_logs:/var/log/kolla \ - --net host \ - --pid host \ - --cgroupns host \ - --privileged \ - -u root \ - --name $NAME \ - ${KOLLA_IMAGE} \ - $CMD $ARGS diff --git a/docker/neutron/neutron-base/extend_start.sh b/docker/neutron/neutron-base/extend_start.sh deleted file mode 100644 index e2a2dfca4..000000000 --- a/docker/neutron/neutron-base/extend_start.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/neutron" ]]; then - mkdir -p /var/log/kolla/neutron -fi -if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then - chmod 755 /var/log/kolla/neutron -fi - -# NOTE(hrw): from RHEL 9 release notes: -# "Iptables-nft and ipset are now deprecated, which included the utilities, -# iptables, ip6tables, ebtables, and arptables. These are all replaced by the -# nftables framework." -# so no need to even use u-a on RHEL 9 family as there is one provider -# (and there is no u-a for ip6tables so script fails) - -if [[ ! ${KOLLA_BASE_DISTRO} =~ centos|rocky ]]; then - if /usr/bin/update-alternatives --display iptables; then - # NOTE(yoctozepto): Kolla-Ansible does not always set KOLLA_LEGACY_IPTABLES; - # the workaround below ensures it gets set to `false` in such cases to fix - # this code under `set -o nounset`. - KOLLA_LEGACY_IPTABLES=${KOLLA_LEGACY_IPTABLES-false} - - if [[ $KOLLA_LEGACY_IPTABLES == "true" ]]; then - sudo /usr/bin/update-alternatives --set iptables /usr/sbin/iptables-legacy - sudo /usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy - else - sudo /usr/bin/update-alternatives --auto iptables - sudo /usr/bin/update-alternatives --auto ip6tables - fi - fi -fi - -. /usr/local/bin/kolla_neutron_extend_start diff --git a/docker/neutron/neutron-base/haproxy b/docker/neutron/neutron-base/haproxy deleted file mode 100644 index 43b9ef9d2..000000000 --- a/docker/neutron/neutron-base/haproxy +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -source /usr/local/etc/neutron-wrappers/config - -ARGS="$@" - -# Extract the network namespace UUID from the command line args provided by -# neutron. Typically of the form (with dnsmasq as an example): -# -# dnsmasq --no-hosts --no-resolv --except-interface=lo \ -# --pid-file=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/pid \ -# --dhcp-hostsfile=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/host ... -NETNS=$(ip netns identify) -NAME=${KOLLA_NAME}_haproxy_${NETNS} -HAPROXY_CMD='$(if [ -f /usr/sbin/haproxy-systemd-wrapper ]; then echo "/usr/sbin/haproxy -Ds"; else echo "/usr/sbin/haproxy -Ws"; fi)' -if [[ -S "/var/run/docker.sock" ]]; then - CLI="docker" - CMD="ip netns exec ${NETNS} "'$HAPROXY' -elif [[ -S "/run/podman/podman.sock" ]]; then - CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman" - CMD='$HAPROXY' -else - echo "Could not detect a supported container runtime, exiting." - exit 1 -fi - -LIST=$($CLI ps -a --filter name=${KOLLA_NAME}_haproxy_ --format '{{.ID}}:{{.Names}}:{{.Status}}' | awk '{print $1}') - -# If the NAME is already taken by a container, give it an unique name -printf "%s\n" "${LIST}" | grep -q "${NAME}$" && NAME="${NAME}_$(date +%Y-%m-%d-%H%M%S-%N)" - -echo "Starting a new child container ${NAME} using image ${KOLLA_IMAGE}" -$CLI run --rm --detach \ - -v /etc/kolla/${KOLLA_SERVICE_NAME}:/etc/neutron:ro \ - -v /run/netns:/run/netns:shared \ - -v neutron_metadata_socket:/var/lib/neutron/kolla \ - -v kolla_logs:/var/log/kolla \ - --net host \ - --pid host \ - --cgroupns host \ - --privileged \ - -u root \ - --name $NAME \ - ${KOLLA_IMAGE} \ - /bin/bash -c "HAPROXY=\"$HAPROXY_CMD\"; exec $CMD $ARGS" diff --git a/docker/neutron/neutron-base/keepalived b/docker/neutron/neutron-base/keepalived deleted file mode 100644 index 6bb2b4d3d..000000000 --- a/docker/neutron/neutron-base/keepalived +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -source /usr/local/etc/neutron-wrappers/config - -ARGS="$@" - -# Extract the network namespace UUID from the command line args provided by -# neutron. Typically of the form (with dnsmasq as an example): -# -# dnsmasq --no-hosts --no-resolv --except-interface=lo \ -# --pid-file=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/pid \ -# --dhcp-hostsfile=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/host ... -NETNS=$(ip netns identify) -NAME=${KOLLA_NAME}_keepalived_${NETNS} - -if [[ -S "/var/run/docker.sock" ]]; then - CLI="docker" - CMD="ip netns exec ${NETNS} /usr/sbin/keepalived -n -l -D" -elif [[ -S "/run/podman/podman.sock" ]]; then - CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman" - CMD='/usr/sbin/keepalived -n -l -D' -else - echo "Could not detect a supported container runtime, exiting." - exit 1 -fi - -LIST=$($CLI ps -a --filter name=${KOLLA_SERVICE}_keepalived_ --format '{{.ID}}:{{.Names}}:{{.Status}}' | awk '{print $1}') - -# If the NAME is already taken by a container, give it an unique name -printf "%s\n" "${LIST}" | grep -q "${NAME}$" && NAME="${NAME}_$(date +%Y-%m-%d-%H%M%S-%N)" - -echo "Starting a new child container ${NAME} using image ${KOLLA_IMAGE}" -$CLI run --rm --detach \ - -v /etc/kolla/${KOLLA_SERVICE_NAME}:/etc/neutron:ro \ - -v /lib/modules:/lib/modules:ro \ - -v /sbin/modprobe:/sbin/modprobe:ro \ - -v /run/netns:/run/netns:shared \ - -v neutron_metadata_socket:/var/lib/neutron/kolla/ \ - -v kolla_logs:/var/log/kolla \ - --net host \ - --pid host \ - --cgroupns host \ - --privileged \ - -u root \ - --name $NAME \ - ${KOLLA_IMAGE} \ - $CMD $ARGS diff --git a/docker/neutron/neutron-base/neutron-keepalived-state-change b/docker/neutron/neutron-base/neutron-keepalived-state-change deleted file mode 100644 index 0b30d88cf..000000000 --- a/docker/neutron/neutron-base/neutron-keepalived-state-change +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -source /usr/local/etc/neutron-wrappers/config - -ARGS="$@" - -# Extract the network namespace UUID from the command line args provided by -# neutron. Typically of the form (with dnsmasq as an example): -# -# dnsmasq --no-hosts --no-resolv --except-interface=lo \ -# --pid-file=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/pid \ -# --dhcp-hostsfile=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/host ... -NETNS=$(ip netns identify) -NAME=${KOLLA_NAME}_keepalived_${NETNS} -if [[ -S "/var/run/docker.sock" ]]; then - CLI="docker exec --detach" - CMD="ip netns exec ${NETNS} /usr/bin/neutron-keepalived-state-change" -elif [[ -S "/run/podman/podman.sock" ]]; then - CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman exec" - CMD="/usr/bin/neutron-keepalived-state-change" -else - echo "Could not detect a supported container runtime, exiting." - exit 1 -fi - -# The state change daemon only runs as a daemon for the moment so we need to -# run it within an existing container with a sensibly matching lifetime. The -# related keepalived container seems an obvious choice. -container_id=$($CLI ps --filter name=$NAME --format "{{.ID}}") - -if [[ -z $container_id ]]; -then - echo "WARNING: keepalived container is not running." - exit 0 -fi - -$CLI -u root \ - --privileged \ - $NAME \ - $CMD $ARGS diff --git a/docker/neutron/neutron-base/neutron_sudoers b/docker/neutron/neutron-base/neutron_sudoers deleted file mode 100644 index d0de94f0e..000000000 --- a/docker/neutron/neutron-base/neutron_sudoers +++ /dev/null @@ -1,11 +0,0 @@ -neutron ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/neutron-rootwrap /etc/neutron/rootwrap.conf * -neutron ALL = (root) NOPASSWD: /var/lib/kolla/venv/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf -neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --set iptables /usr/sbin/iptables-legacy -neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy -neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --auto iptables -neutron ALL = (root) NOPASSWD: /usr/bin/update-alternatives --auto ip6tables -neutron ALL = (root) NOPASSWD: /usr/sbin/update-alternatives --set iptables /usr/sbin/iptables-legacy -neutron ALL = (root) NOPASSWD: /usr/sbin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy -neutron ALL = (root) NOPASSWD: /usr/sbin/update-alternatives --auto iptables -neutron ALL = (root) NOPASSWD: /usr/sbin/update-alternatives --auto ip6tables -neutron ALL = (root) NOPASSWD: /usr/local/lib/neutron-wrappers/copy-wrappers, /usr/local/lib/neutron-wrappers/delete-wrappers diff --git a/docker/neutron/neutron-base/radvd b/docker/neutron/neutron-base/radvd deleted file mode 100644 index 3f5dd1cfa..000000000 --- a/docker/neutron/neutron-base/radvd +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -source /usr/local/etc/neutron-wrappers/config - -ARGS="$@" -# Extract the network namespace UUID from the command line args provided by -# neutron. Typically of the form (with dnsmasq as an example): -# -# dnsmasq --no-hosts --no-resolv --except-interface=lo \ -# --pid-file=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/pid \ -# --dhcp-hostsfile=/var/lib/neutron/dhcp/317716b8-919a-4a6f-8db1-78128ec3b100/host ... -NETWORK_ID=$(echo $ARGS| awk '{if (match($0, /(\w{8}-\w{4}-\w{4}-\w{4}-\w{12})/,m)) print m[0] }') -NAME=${KOLLA_NAME}_radvd_${NETWORK_ID} -if [[ -S "/var/run/docker.sock" ]]; then - CLI="docker" - CMD="ip netns exec qrouter-${NETWORK_ID} /usr/sbin/radvd -n" -elif [[ -S "/run/podman/podman.sock" ]]; then - CLI="nsenter --net=/run/netns/${NETNS} --preserve-credentials -m -t 1 podman" - CMD="/usr/sbin/radvd -n" -else - echo "Could not detect a supported container runtime, exiting." - exit 1 -fi - -LIST=$($CLI ps -a --filter name=${KOLLA_NAME}_radvd_ --format '{{.ID}}:{{.Names}}:{{.Status}}' | awk '{print $1}') -# If the NAME is already taken by a container, give it an unique name -printf "%s\n" "${LIST}" | grep -q "${NAME}$" && NAME="${NAME}_$(date +%Y-%m-%d-%H%M%S-%N)" - -echo "Starting a new child container ${NAME} using image ${KOLLA_IMAGE}" -$CLI run --rm --detach \ - -v /etc/kolla/${KOLLA_SERVICE_NAME}:/etc/neutron:ro \ - -v /run/netns:/run/netns:shared \ - -v neutron_metadata_socket:/var/lib/neutron/kolla/ \ - -v kolla_logs:/var/log/kolla \ - --net host \ - --pid host \ - --cgroupns host \ - --privileged \ - -u root \ - --name $NAME \ - ${KOLLA_IMAGE} \ - $CMD $ARGS diff --git a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 b/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 deleted file mode 100644 index 3ad2ab596..000000000 --- a/docker/neutron/neutron-bgp-dragent/Dockerfile.j2 +++ /dev/null @@ -1,24 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block neutron_bgp_dragent_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -ADD neutron-bgp-dragent-archive /neutron-bgp-dragent-source - - {% set neutron_bgp_dragent_pip_packages = [ - '/neutron_dynamic_routing' - ] %} - -RUN ln -s neutron-bgp-dragent-source/* neutron_dynamic_routing \ - && {{ macros.install_pip(neutron_bgp_dragent_pip_packages | customizable("pip_packages")) }} - -{{ macros.kolla_patch_sources() }} - -{% block neutron_bgp_dragent_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 deleted file mode 100644 index 035433bf2..000000000 --- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 +++ /dev/null @@ -1,22 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block neutron_dhcp_agent_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% set neutron_dhcp_agent_packages = [ -] %} - -{{ macros.install_packages(neutron_dhcp_agent_packages | customizable("packages")) }} - -{{ macros.kolla_patch_sources() }} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -{% block neutron_dhcp_agent_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/docker/neutron/neutron-dhcp-agent/extend_start.sh b/docker/neutron/neutron-dhcp-agent/extend_start.sh deleted file mode 100644 index edaad2a3a..000000000 --- a/docker/neutron/neutron-dhcp-agent/extend_start.sh +++ /dev/null @@ -1,17 +0,0 @@ -if [[ ! -d "/var/log/kolla/neutron" ]]; then - mkdir -p /var/log/kolla/neutron -fi -if [[ ! -f "/var/log/kolla/neutron/dnsmasq.log" ]]; then - touch /var/log/kolla/neutron/dnsmasq.log - chown neutron:kolla /var/log/kolla/neutron/dnsmasq.log -fi - -if [[ "${KOLLA_NEUTRON_WRAPPERS:-false}" == "true" ]]; then - echo "Copying neutron agent wrappers to /usr/local/bin" - sudo -E /usr/local/lib/neutron-wrappers/copy-wrappers -else - echo "Removing neutron agent wrappers from /usr/local/bin" - sudo -E /usr/local/lib/neutron-wrappers/delete-wrappers -fi - -. /usr/local/bin/kolla_neutron_extend_start diff --git a/docker/neutron/neutron-l3-agent/Dockerfile.j2 b/docker/neutron/neutron-l3-agent/Dockerfile.j2 deleted file mode 100644 index ae0457c18..000000000 --- a/docker/neutron/neutron-l3-agent/Dockerfile.j2 +++ /dev/null @@ -1,32 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block neutron_l3_agent_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if base_package_type == 'rpm' %} - {% set neutron_l3_agent_packages = [ - 'libreswan', - 'radvd' - ] %} -{% elif base_package_type == 'deb' %} - {% set neutron_l3_agent_packages = [ - 'strongswan', - 'radvd', - 'libnetfilter-log1' - ] %} -{% endif %} - -{{ macros.install_packages(neutron_l3_agent_packages | customizable("packages")) }} - -{{ macros.kolla_patch_sources() }} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -{% block neutron_l3_agent_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/docker/neutron/neutron-l3-agent/extend_start.sh b/docker/neutron/neutron-l3-agent/extend_start.sh deleted file mode 100644 index f95c1eda2..000000000 --- a/docker/neutron/neutron-l3-agent/extend_start.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -if [[ ! -d "/var/log/kolla/neutron" ]]; then - mkdir -p /var/log/kolla/neutron -fi -if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then - chmod 755 /var/log/kolla/neutron -fi - -# NOTE(hrw): from RHEL 9 release notes: -# "Iptables-nft and ipset are now deprecated, which included the utilities, -# iptables, ip6tables, ebtables, and arptables. These are all replaced by the -# nftables framework." -# so no need to even use u-a on RHEL 9 family as there is one provider -# (and there is no u-a for ip6tables so script fails) -if [[ ! ${KOLLA_BASE_DISTRO} =~ centos|rocky ]]; then - if /usr/bin/update-alternatives --display iptables; then - # NOTE(yoctozepto): Kolla-Ansible does not always set KOLLA_LEGACY_IPTABLES; - # the workaround below ensures it gets set to `false` in such cases to fix - # this code under `set -o nounset`. - KOLLA_LEGACY_IPTABLES=${KOLLA_LEGACY_IPTABLES-false} - if [[ $KOLLA_LEGACY_IPTABLES == "true" ]]; then - sudo /usr/bin/update-alternatives --set iptables /usr/sbin/iptables-legacy - sudo /usr/bin/update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy - else - sudo /usr/bin/update-alternatives --auto iptables - sudo /usr/bin/update-alternatives --auto ip6tables - fi - fi -fi - -if [[ "${KOLLA_NEUTRON_WRAPPERS:-false}" == "true" ]]; then - echo "Copying neutron agent wrappers to /usr/local/bin" - sudo -E /usr/local/lib/neutron-wrappers/copy-wrappers -else - echo "Removing neutron agent wrappers from /usr/local/bin" - sudo -E /usr/local/lib/neutron-wrappers/delete-wrappers -fi - -. /usr/local/bin/kolla_neutron_extend_start diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 deleted file mode 100644 index 3736f70c8..000000000 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ /dev/null @@ -1,22 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block neutron_metadata_agent_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% set neutron_metadata_agent_packages = [ -] %} - -{{ macros.install_packages(neutron_metadata_agent_packages | customizable("packages")) }} - -{{ macros.kolla_patch_sources() }} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -{% block neutron_metadata_agent_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/docker/neutron/neutron-metadata-agent/extend_start.sh b/docker/neutron/neutron-metadata-agent/extend_start.sh deleted file mode 100644 index 001898f68..000000000 --- a/docker/neutron/neutron-metadata-agent/extend_start.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -if [[ ! -d "/var/log/kolla/neutron" ]]; then - mkdir -p /var/log/kolla/neutron -fi -if [[ $(stat -c %a /var/log/kolla/neutron) != "755" ]]; then - chmod 755 /var/log/kolla/neutron -fi - -if [[ "${KOLLA_NEUTRON_WRAPPERS:-false}" == "true" ]]; then - echo "Copying neutron agent wrappers to /usr/local/bin" - sudo -E /usr/local/lib/neutron-wrappers/copy-wrappers -else - echo "Removing neutron agent wrappers from /usr/local/bin" - sudo -E /usr/local/lib/neutron-wrappers/delete-wrappers -fi - -. /usr/local/bin/kolla_neutron_extend_start diff --git a/docker/neutron/neutron-metering-agent/Dockerfile.j2 b/docker/neutron/neutron-metering-agent/Dockerfile.j2 deleted file mode 100644 index e9d7f74e0..000000000 --- a/docker/neutron/neutron-metering-agent/Dockerfile.j2 +++ /dev/null @@ -1,15 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block neutron_metering_agent_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.kolla_patch_sources() }} - -{% block neutron_metering_agent_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 deleted file mode 100644 index 4ee89c19a..000000000 --- a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 +++ /dev/null @@ -1,27 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block neutron_mlnx_agent_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% set neutron_mlnx_agent_packages = [ - 'python3-libvirt', -] %} - -{{ macros.install_packages(neutron_mlnx_agent_packages | customizable("packages")) }} - -{% set neutron_mlnx_agent_pip_packages = [ - 'networking-mlnx', -] %} - -RUN {{ macros.install_pip(neutron_mlnx_agent_pip_packages | customizable("pip_packages")) }} - -{{ macros.kolla_patch_sources() }} - -{% block neutron_mlnx_agent_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 deleted file mode 100644 index b9499e6f7..000000000 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ /dev/null @@ -1,17 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block neutron_openvswitch_agent_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.install_packages(neutron_openvswitch_agent_packages | customizable("packages")) }} - -{{ macros.kolla_patch_sources() }} - -{% block neutron_openvswitch_agent_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/docker/neutron/neutron-ovn-agent/Dockerfile.j2 b/docker/neutron/neutron-ovn-agent/Dockerfile.j2 deleted file mode 100644 index fe4e352ac..000000000 --- a/docker/neutron/neutron-ovn-agent/Dockerfile.j2 +++ /dev/null @@ -1,20 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block neutron_ovn_agent_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% set neutron_ovn_agent_packages = [ -] %} - -{{ macros.install_packages(neutron_ovn_agent_packages | customizable("packages")) }} - -{{ macros.kolla_patch_sources() }} - -{% block neutron_ovn_agent_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/docker/neutron/neutron-ovn-vpn-agent/Dockerfile.j2 b/docker/neutron/neutron-ovn-vpn-agent/Dockerfile.j2 deleted file mode 100644 index 4fbaaa78f..000000000 --- a/docker/neutron/neutron-ovn-vpn-agent/Dockerfile.j2 +++ /dev/null @@ -1,31 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block neutron_ovn_vpn_agent_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -# Note: VPN is currently not working on RHEL 10 due to a known issue: -# https://bugs.launchpad.net/neutron/+bug/2146308 -{% if base_package_type == 'rpm' %} - {% set neutron_ovn_vpn_agent_packages = [ - 'libreswan' - ] %} -{% elif base_package_type == 'deb' %} - {% set neutron_ovn_vpn_agent_packages = [ - 'strongswan', - 'strongswan-starter', - 'strongswan-charon' - ] %} -{% endif %} - -{{ macros.install_packages(neutron_ovn_vpn_agent_packages | customizable("packages")) }} - -{{ macros.kolla_patch_sources() }} - -{% block neutron_ovn_vpn_agent_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 deleted file mode 100644 index bda0d3dcf..000000000 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ /dev/null @@ -1,33 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block neutron_server_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% set neutron_server_pip_packages = [ - 'networking-hyperv' -] %} - -{% set neutron_server_plugins_pip_packages = [ - '/plugins/*' -] %} - -ADD plugins-archive / - -COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start - -RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packages")) }} \ - && if [ "$(ls /plugins)" ]; then \ - {{ macros.install_pip(neutron_server_plugins_pip_packages) }}; \ - fi \ - && chmod 644 /usr/local/bin/kolla_neutron_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block neutron_server_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh deleted file mode 100644 index 630eb6e1f..000000000 --- a/docker/neutron/neutron-server/extend_start.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases -# of the KOLLA_BOOTSTRAP variable being set, including empty. -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - neutron-db-manage --subproject neutron upgrade head - if [[ "${!NEUTRON_BOOTSTRAP_SERVICES[@]}" ]]; then - for service in ${NEUTRON_BOOTSTRAP_SERVICES}; do - neutron-db-manage --subproject $service upgrade head - done - fi - exit 0 -fi - -# Migrate database and exit if KOLLA_UPGRADE variable is set. This catches all cases -# of the KOLLA_UPGRADE variable being set, including empty. -if [[ "${!KOLLA_UPGRADE[@]}" ]]; then - if [[ "${!NEUTRON_DB_EXPAND[@]}" ]]; then - DB_ACTION="--expand" - echo "Expanding database" - fi - if [[ "${!NEUTRON_DB_CONTRACT[@]}" ]]; then - DB_ACTION="--contract" - echo "Contracting database" - fi - - neutron-db-manage --subproject neutron upgrade $DB_ACTION - if [[ "${!NEUTRON_ROLLING_UPGRADE_SERVICES[@]}" ]]; then - for service in ${NEUTRON_ROLLING_UPGRADE_SERVICES}; do - neutron-db-manage --subproject $service upgrade $DB_ACTION - done - fi - exit 0 -fi diff --git a/docker/neutron/neutron-sriov-agent/Dockerfile.j2 b/docker/neutron/neutron-sriov-agent/Dockerfile.j2 deleted file mode 100644 index c5d74fbb2..000000000 --- a/docker/neutron/neutron-sriov-agent/Dockerfile.j2 +++ /dev/null @@ -1,17 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block neutron_sriov_agent_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.install_packages(neutron_sriov_agent_packages | customizable("packages")) }} - -{{ macros.kolla_patch_sources() }} - -{% block neutron_sriov_agent_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER neutron |
