openstack/kolla
Code Issues Proposed changes

Merge "Remove customizable for plugins_pip_packages"

Browse Source
This commit is contained in:
Zuul 2018-03-13 16:15:51 +00:00 committed by Gerrit Code Review
commit 2a50816706
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/keystone/keystone/Dockerfile.j2
View File

@ -17,7 +17,7 @@ ADD plugins-archive /
] %}
RUN if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(keystone_plugins_pip_packages | customizable("pip_packages")) }}; \
{{ macros.install_pip(keystone_plugins_pip_packages) }}; \
fi
{% endif %}

2
docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2
View File

@ -28,7 +28,7 @@ ADD plugins-archive /
] %}
RUN if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(neutron_metadata_agent_ovn_plugins_pip_packages | customizable("pip_packages")) }}; \
{{ macros.install_pip(neutron_metadata_agent_ovn_plugins_pip_packages) }}; \
fi
{% endif %}

2
docker/neutron/neutron-server-opendaylight/Dockerfile.j2
View File

@ -39,7 +39,7 @@ ADD plugins-archive /
] %}
RUN if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages | customizable("pip_packages")) }}; \
{{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages) }}; \
fi
{% endif %}

2
docker/neutron/neutron-server-ovn/Dockerfile.j2
View File

@ -23,7 +23,7 @@ ADD plugins-archive /
] %}
RUN if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(neutron_server_ovn_plugins_pip_packages | customizable("pip_packages")) }}; \
{{ macros.install_pip(neutron_server_ovn_plugins_pip_packages) }}; \
fi
{% endif %}

2
docker/neutron/neutron-server/Dockerfile.j2
View File

@ -39,7 +39,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
ADD plugins-archive /
RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packages")) }} \
&& if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(neutron_server_plugins_pip_packages | customizable("pip_packages")) }}; \
{{ macros.install_pip(neutron_server_plugins_pip_packages) }}; \
fi
{% endif %}

2
docker/nova/nova-compute/Dockerfile.j2
View File

@ -141,7 +141,7 @@ RUN mkdir -p /etc/ceph
ADD plugins-archive /
RUN {{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages")) }} \
&& if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(nova_compute_plugins_pip_packages | customizable("pip_packages")) }}; \
{{ macros.install_pip(nova_compute_plugins_pip_packages) }}; \
fi
{% endif %}