Merge "Only copy plugin-archive into image for source builds"

3 files changed, 20 insertions, 19 deletions

diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2
index 26745fee6..d7932e793 100644
--- a/docker/keystone/keystone/Dockerfile.j2
+++ b/docker/keystone/keystone/Dockerfile.j2
@@ -5,7 +5,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
+{% if install_type == 'source' %}
 ADD plugins-archive /
+{% endif %}
+
 COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index cce0d40da..5273d02be 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -33,22 +33,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'oslo-vmware'
     ] %}
 
-RUN {{ macros.install_pip(neutron_server_pip_packages | customizable("pip_packages")) }}
-
-{% endif %}
+    {% set neutron_server_plugins_pip_packages = [
+        '/plugins/*'
+    ] %}
 
 ADD plugins-archive /
-
-{% set neutron_server_plugins_pip_packages = [
-    '/plugins/*'
-] %}
-
-COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start
-RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start \
+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")) }}; \
        fi
 
+{% endif %}
+
+COPY extend_start.sh /usr/local/bin/kolla_neutron_extend_start
+RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start
+
 {% block neutron_server_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 
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 %}