eb3cd4f30f
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
22 lines
646 B
Django/Jinja
22 lines
646 B
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
{% block neutron_dhcp_agent_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if base_distro in ['debian', 'ubuntu'] %}
|
|
{% if install_type == 'binary' %}
|
|
{% set neutron_dhcp_agent_packages = [
|
|
'neutron-dhcp-agent'
|
|
] %}
|
|
{% endif %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(neutron_dhcp_agent_packages | customizable("packages")) }}
|
|
|
|
{% block neutron_dhcp_agent_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
|
|
USER neutron
|