openstack
/
kolla
Code Issues Proposed changes

Fix neutron dhcp agent dockerfile for non-deb/ubuntu 

The macro.install_packages line was inside the if block for debian and
ubuntu distros, making it so that setting neutron_dhcp_agent_packages
via overrides has no effect on CentOS, etc.

Change-Id: I131ada5f92b5827fd571e698719ec12dea1e66cb
Closes-Bug: #1753568
This commit is contained in:
Brent Eagles 2018-03-05 15:50:11 -03:30
parent 91ad86c881
commit eb3cd4f30f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/neutron/neutron-dhcp-agent/Dockerfile.j2
View File

@ -7,16 +7,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_distro in ['debian', 'ubuntu'] %}
{% if install_type == 'binary' %}
{% set neutron_dhcp_agent_packages = [
'neutron-dhcp-agent'
] %}
{{ macros.install_packages(neutron_dhcp_agent_packages | customizable("packages")) }}
{% endif %}
{% endif %}
{{ macros.install_packages(neutron_dhcp_agent_packages | customizable("packages")) }}
{% block neutron_dhcp_agent_footer %}{% endblock %}
{% block footer %}{% endblock %}