mirror of
https://opendev.org/openstack/kolla.git
synced 2026-01-16 23:10:33 +00:00
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>
This commit is contained in:
parent
0d51f0ab03
commit
df4d573eb5
3 changed files with 27 additions and 0 deletions
|
|
@ -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 %}
|
||||
|
||||
|
|
|
|||
18
docker/neutron/neutron-metadata-agent/extend_start.sh
Normal file
18
docker/neutron/neutron-metadata-agent/extend_start.sh
Normal file
|
|
@ -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
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
The neutron wrapper scripts, which were introduced in
|
||||
I679ac66186d457ae53f89469fe22c5662089019a, are now included in the
|
||||
``neutron-metadata-agent`` container, making it possible to run
|
||||
haproxy processes as separate containers.
|
||||
Loading…
Add table
Reference in a new issue