Skip to content

Synchronise 2024.1 with upstream #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2025
Merged

Synchronise 2024.1 with upstream #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docker/neutron/neutron-dhcp-agent/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build

{{ macros.install_packages(neutron_dhcp_agent_packages | customizable("packages")) }}

COPY extend_start.sh /usr/local/bin/kolla_extend_start

{% block neutron_dhcp_agent_footer %}{% endblock %}
{% block footer %}{% endblock %}

Expand Down
9 changes: 9 additions & 0 deletions docker/neutron/neutron-dhcp-agent/extend_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
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

. /usr/local/bin/kolla_neutron_extend_start