6b81f91c5e
The pip packages are normally already configurable with the <image_name>_pip_packages variable. It doesn't make much sense to make the list of packages installed with the plugins mechanism configurable via the <image_name>_plugins_pip_packages variable too. And even if we wanted to, the parameter to the `customizable()` function should be 'plugins_pip_packages' and not 'pip_packages'. This commit removes the customizable bits from the plugins install macro, at least until we get a good use case for it. Change-Id: I90dd28b8c5d981e6028af353e34645712ef09b0b
35 lines
835 B
Django/Jinja
35 lines
835 B
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
USER root
|
|
|
|
{% block neutron_server_ovn %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% set neutron_server_ovn_packages = [
|
|
'python-networking-ovn',
|
|
] %}
|
|
|
|
{{ macros.install_packages(neutron_server_ovn_packages | customizable("packages")) }}
|
|
|
|
{% elif install_type == 'source' %}
|
|
|
|
ADD plugins-archive /
|
|
|
|
{% set neutron_server_ovn_plugins_pip_packages = [
|
|
'/plugins/*'
|
|
] %}
|
|
|
|
RUN if [ "$(ls /plugins)" ]; then \
|
|
{{ macros.install_pip(neutron_server_ovn_plugins_pip_packages) }}; \
|
|
fi
|
|
|
|
{% endif %}
|
|
|
|
{% block neutron_server_ovn_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
|
|
USER neutron
|