Skip plugins install for keystone binary builds

There should be no pip install in binary builds, move the installation
of the downloaded bits where it belongs into the 'source' install_type
section.

Change-Id: I6d8609d072d18e635250df1c1e9aa687ce1f769d

1 files changed, 9 insertions, 8 deletions

diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2
index d7932e793..f56013aa6 100644
--- a/docker/keystone/keystone/Dockerfile.j2
+++ b/docker/keystone/keystone/Dockerfile.j2
@@ -5,21 +5,22 @@ 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
+RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap
+
+{% if install_type == 'source' %}
+ADD plugins-archive /
 
 {% set keystone_plugins_pip_packages = [
     '/plugins/*'
 ] %}
 
-RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap \
-    && if [ "$(ls /plugins)" ]; then \
-           {{ macros.install_pip(keystone_plugins_pip_packages | customizable("pip_packages")) }}; \
-       fi
+RUN if [ "$(ls /plugins)" ]; then \
+        {{ macros.install_pip(keystone_plugins_pip_packages | customizable("pip_packages")) }}; \
+    fi
+
+{% endif %}
 
 {% block keystone_footer %}{% endblock %}
 {% block footer %}{% endblock %}