From 6b81f91c5e3de7c9641c0b45e6c35ff45813a764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Tue, 23 Jan 2018 14:15:51 +0100
Subject: [PATCH] Remove customizable for plugins_pip_packages

The pip packages are normally already configurable with the
<image_name>_pip_packages variable. It doesn't make much sense to make
the list of packages installed with the plugins mechanism configurable
via the <image_name>_plugins_pip_packages variable too.

And even if we wanted to, the parameter to the `customizable()`
function should be 'plugins_pip_packages' and not 'pip_packages'.

This commit removes the customizable bits from the plugins install
macro, at least until we get a good use case for it.

Change-Id: I90dd28b8c5d981e6028af353e34645712ef09b0b
---
 docker/keystone/keystone/Dockerfile.j2                   | 2 +-
 docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2  | 2 +-
 docker/neutron/neutron-server-opendaylight/Dockerfile.j2 | 2 +-
 docker/neutron/neutron-server-ovn/Dockerfile.j2          | 2 +-
 docker/neutron/neutron-server/Dockerfile.j2              | 2 +-
 docker/nova/nova-compute/Dockerfile.j2                   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2
index f56013aa61..073cf7c6e2 100644
--- a/docker/keystone/keystone/Dockerfile.j2
+++ b/docker/keystone/keystone/Dockerfile.j2
@@ -17,7 +17,7 @@ ADD plugins-archive /
 ] %}
 
 RUN if [ "$(ls /plugins)" ]; then \
-        {{ macros.install_pip(keystone_plugins_pip_packages | customizable("pip_packages")) }}; \
+        {{ macros.install_pip(keystone_plugins_pip_packages) }}; \
     fi
 
 {% endif %}
diff --git a/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2 b/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2
index 4a75f4a786..d84a2a6dc9 100644
--- a/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2
+++ b/docker/neutron/neutron-metadata-agent-ovn/Dockerfile.j2
@@ -28,7 +28,7 @@ ADD plugins-archive /
     ] %}
 
 RUN if [ "$(ls /plugins)" ]; then \
-        {{ macros.install_pip(neutron_metadata_agent_ovn_plugins_pip_packages | customizable("pip_packages")) }}; \
+        {{ macros.install_pip(neutron_metadata_agent_ovn_plugins_pip_packages) }}; \
     fi
 
 {% endif %}
diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2
index b59feeb210..c7812866e3 100644
--- a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2
+++ b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2
@@ -39,7 +39,7 @@ ADD plugins-archive /
 ] %}
 
 RUN if [ "$(ls /plugins)" ]; then \
-        {{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages | customizable("pip_packages")) }}; \
+        {{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages) }}; \
     fi
 
 {% endif %}
diff --git a/docker/neutron/neutron-server-ovn/Dockerfile.j2 b/docker/neutron/neutron-server-ovn/Dockerfile.j2
index 06b5688ed7..5d855cb71a 100644
--- a/docker/neutron/neutron-server-ovn/Dockerfile.j2
+++ b/docker/neutron/neutron-server-ovn/Dockerfile.j2
@@ -23,7 +23,7 @@ ADD plugins-archive /
 ] %}
 
 RUN if [ "$(ls /plugins)" ]; then \
-        {{ macros.install_pip(neutron_server_ovn_plugins_pip_packages | customizable("pip_packages")) }}; \
+        {{ macros.install_pip(neutron_server_ovn_plugins_pip_packages) }}; \
     fi
 
 {% endif %}
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index 96947787d6..449364fe28 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -39,7 +39,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 ADD plugins-archive /
 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")) }}; \
+           {{ macros.install_pip(neutron_server_plugins_pip_packages) }}; \
        fi
 
 {% endif %}
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 758c30e79a..c6b1d67a31 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -141,7 +141,7 @@ RUN mkdir -p /etc/ceph
 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")) }}; \
+           {{ macros.install_pip(nova_compute_plugins_pip_packages) }}; \
        fi
 
 {% endif %}