aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kolla/docker/neutron/neutron-ovn-agent/Dockerfile.j22
-rw-r--r--kolla/docker/neutron/neutron-ovn-agent/extend_start.sh11
-rw-r--r--releasenotes/notes/neutron-ovn-agent-wrappers-b937a71cd298f21a.yaml7
3 files changed, 20 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
diff --git a/releasenotes/notes/neutron-ovn-agent-wrappers-b937a71cd298f21a.yaml b/releasenotes/notes/neutron-ovn-agent-wrappers-b937a71cd298f21a.yaml
new file mode 100644
index 000000000..128197272
--- /dev/null
+++ b/releasenotes/notes/neutron-ovn-agent-wrappers-b937a71cd298f21a.yaml
@@ -0,0 +1,7 @@
+---
+features:
+ - |
+ The ``neutron-ovn-agent`` image now supports running the HAProxy
+ processes of its metadata extension in separate containers, as the
+ ``neutron-metadata-agent`` image already does. This is enabled by setting
+ ``KOLLA_NEUTRON_WRAPPERS=true`` in the container environment.