diff options
| author | Brent Eagles <beagles@redhat.com> | 2018-03-05 15:50:11 -0330 |
|---|---|---|
| committer | Brent Eagles <beagles@redhat.com> | 2018-03-05 15:52:21 -0330 |
| commit | eb3cd4f30f78b9e4c52209e9ed58f5d79fdffd3c (patch) | |
| tree | 0f47ef36d628a2ad40c11ddd7ffd2f7f91c93a66 /docker/neutron | |
| parent | 91ad86c8810653218c1777db2f6967dd38c6ca43 (diff) | |
| download | kolla-eb3cd4f30f78b9e4c52209e9ed58f5d79fdffd3c.tar.gz kolla-eb3cd4f30f78b9e4c52209e9ed58f5d79fdffd3c.zip | |
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
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-dhcp-agent/Dockerfile.j2 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 index afbf87acc..271c99cd3 100644 --- a/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-dhcp-agent/Dockerfile.j2 @@ -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 %} |