From 15543949b118ec30fcc1bbfc4c2f6d9188ef7664 Mon Sep 17 00:00:00 2001 From: Martin André Date: Mon, 10 Apr 2017 10:48:10 +0200 Subject: Only copy plugin-archive into image for source builds The plugin mechanism is meant to be for source install type only. Change-Id: I1371a253236b09dc62ea91dce6d652e1c5603015 Closes-Bug: #1681345 --- docker/nova/nova-compute/Dockerfile.j2 | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'docker/nova') diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 10ba40d4a..8f4e8e937 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -113,23 +113,22 @@ RUN mkdir -p /etc/ceph ] %} -RUN {{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages")) }} - -{% endif %} - -ADD plugins-archive / - {% set nova_compute_plugins_pip_packages = [ '/plugins/*' ] %} -COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start -RUN chmod 755 /usr/local/bin/kolla_nova_extend_start \ - && rm -f /etc/machine-id \ +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")) }}; \ fi +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start +RUN chmod 755 /usr/local/bin/kolla_nova_extend_start \ + && rm -f /etc/machine-id + ENV PATH $PATH:/lib/udev {% block nova_compute_footer %}{% endblock %} -- cgit v1.2.3