aboutsummaryrefslogtreecommitdiff
path: root/docker/nova
diff options
context:
space:
mode:
Diffstat (limited to 'docker/nova')
-rw-r--r--docker/nova/nova-compute/Dockerfile.j217
1 files changed, 8 insertions, 9 deletions
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 %}