diff options
| author | Zuul <zuul@review.openstack.org> | 2018-03-12 14:19:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-03-12 14:19:20 +0000 |
| commit | ab97f3bb2aaecf947fe95a349749b02d50b40bee (patch) | |
| tree | b8650d0793f492c34553c4061b9fa4bc0bd94a3f /docker | |
| parent | bc86a53f8c577c210f3de2cae5c6bade3b7c76cc (diff) | |
| parent | eb3cd4f30f78b9e4c52209e9ed58f5d79fdffd3c (diff) | |
| download | kolla-ab97f3bb2aaecf947fe95a349749b02d50b40bee.tar.gz kolla-ab97f3bb2aaecf947fe95a349749b02d50b40bee.zip | |
Merge "Fix neutron dhcp agent dockerfile for non-deb/ubuntu"
Diffstat (limited to 'docker')
| -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 %} |