aboutsummaryrefslogtreecommitdiff
path: root/kolla/docker
diff options
context:
space:
mode:
authorMichael Still <mikal@stillhq.com>2026-10-29 05:32:51 +1100
committerMichael Still <mikal@stillhq.com>2026-10-29 05:32:51 +1100
commite7f13f6c58e1c0a34e8758745240d1c33f0f8e02 (patch)
tree557b2c15fde7aa39355d3ffef5d0539f24a7fc76 /kolla/docker
parentb65a746e6758c1a4a0ea2ece7946d7984a0811ec (diff)
downloadkolla-e7f13f6c58e1c0a34e8758745240d1c33f0f8e02.tar.gz
kolla-e7f13f6c58e1c0a34e8758745240d1c33f0f8e02.zip
Support neutron agent wrappers in neutron-ovn-agent
Neutron has removed the standalone OVN metadata agent, so metadata is now served by the metadata extension of neutron-ovn-agent. Give that image the same extend_start.sh as neutron-metadata-agent, so that its HAProxy processes can run in separate containers and survive agent restarts. Related-Bug: #2161114 Change-Id: Iee3d4639183434c83f57cc459c3e14159d932105 Assisted-By: Claude Opus 5.5 (low effort) Signed-off-by: Michael Still <mikal@stillhq.com>
Diffstat (limited to 'kolla/docker')
-rw-r--r--kolla/docker/neutron/neutron-ovn-agent/Dockerfile.j22
-rw-r--r--kolla/docker/neutron/neutron-ovn-agent/extend_start.sh11
2 files changed, 13 insertions, 0 deletions
diff --git a/kolla/docker/neutron/neutron-ovn-agent/Dockerfile.j2 b/kolla/docker/neutron/neutron-ovn-agent/Dockerfile.j2
index 915bef108..d5f6cfe92 100644
--- a/kolla/docker/neutron/neutron-ovn-agent/Dockerfile.j2
+++ b/kolla/docker/neutron/neutron-ovn-agent/Dockerfile.j2
@@ -16,6 +16,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
{{ macros.kolla_patch_sources() }}
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
{% block neutron_ovn_agent_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ macros.kolla_cleanup_repos() }}
diff --git a/kolla/docker/neutron/neutron-ovn-agent/extend_start.sh b/kolla/docker/neutron/neutron-ovn-agent/extend_start.sh
new file mode 100644
index 000000000..7a45654d6
--- /dev/null
+++ b/kolla/docker/neutron/neutron-ovn-agent/extend_start.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+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