diff options
| author | Maximilian Stinsky <maximilian.stinsky-damke@wiit.cloud> | 2025-09-12 10:24:42 +0200 |
|---|---|---|
| committer | Maximilian Stinsky <maximilian.stinsky-damke@wiit.cloud> | 2025-09-17 09:44:05 +0200 |
| commit | df4d573eb55bb8f72c9059b1a353e5357eec8e6e (patch) | |
| tree | 053ef798b75151da6ec83a42d8317e6860f7531e /docker/neutron | |
| parent | 0d51f0ab0349d51ec3faa3061ddd89cde2b2364e (diff) | |
| download | kolla-df4d573eb55bb8f72c9059b1a353e5357eec8e6e.tar.gz kolla-df4d573eb55bb8f72c9059b1a353e5357eec8e6e.zip | |
neutron-metadata-agent: copy wrapper script for haproxy processes
In ml2/ovn setups, the neutron-metadata-agent spawns haproxy processes
to serve metadata requests. To run these haproxy instances inside their
own containers, the wrapper script must be available in the
metadata-agent container.
This is a follow up on I679ac66186d457ae53f89469fe22c5662089019a
Change-Id: Ia47af98ff723ebe8ea8461d05a2bc3b58af845f9
Signed-off-by: Maximilian Stinsky <maximilian.stinsky-damke@wiit.cloud>
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-metadata-agent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-metadata-agent/extend_start.sh | 18 |
2 files changed, 20 insertions, 0 deletions
diff --git a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 index 676ee1a85..91c308405 100644 --- a/docker/neutron/neutron-metadata-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-metadata-agent/Dockerfile.j2 @@ -14,6 +14,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.kolla_patch_sources() }} +COPY extend_start.sh /usr/local/bin/kolla_extend_start + {% block neutron_metadata_agent_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/neutron/neutron-metadata-agent/extend_start.sh b/docker/neutron/neutron-metadata-agent/extend_start.sh new file mode 100644 index 000000000..001898f68 --- /dev/null +++ b/docker/neutron/neutron-metadata-agent/extend_start.sh @@ -0,0 +1,18 @@ +#!/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 |