diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-02 10:10:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-02 10:10:37 +0000 |
| commit | 399b2f1d5f3a9f4a69e25ee909c9de804e41efe7 (patch) | |
| tree | aff81cc225a9c88de70b015dc12c1d46955004d6 /docker/nova | |
| parent | e67409a17c21884f5898c6d8f5e485b81bf71df3 (diff) | |
| parent | 15543949b118ec30fcc1bbfc4c2f6d9188ef7664 (diff) | |
| download | kolla-399b2f1d5f3a9f4a69e25ee909c9de804e41efe7.tar.gz kolla-399b2f1d5f3a9f4a69e25ee909c9de804e41efe7.zip | |
Merge "Only copy plugin-archive into image for source builds"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 710f5b9cd..2d49d7f31 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 %} |