openstack/kolla
Code Issues Proposed changes

Merge "Fix neutron dhcp agent dockerfile for non-deb/ubuntu"

Browse Source
This commit is contained in:
Zuul 2018-03-12 14:19:20 +00:00 committed by Gerrit Code Review
commit ab97f3bb2a
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 base_distro in ['debian', 'ubuntu'] %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% set neutron_dhcp_agent_packages = [ {% set neutron_dhcp_agent_packages = [
'neutron-dhcp-agent' 'neutron-dhcp-agent'
] %} ] %}
{% endif %}
{% endif %}
{{ macros.install_packages(neutron_dhcp_agent_packages | customizable("packages")) }} {{ macros.install_packages(neutron_dhcp_agent_packages | customizable("packages")) }}
{% endif %}
{% endif %}
{% block neutron_dhcp_agent_footer %}{% endblock %} {% block neutron_dhcp_agent_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}