Merge "Remove customizable for plugins_pip_packages"

6 files changed, 6 insertions, 6 deletions

diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2
index f56013aa6..073cf7c6e 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 4a75f4a78..d84a2a6dc 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 b59feeb21..c7812866e 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 06b5688ed..5d855cb71 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 96947787d..449364fe2 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 8fc0d3e8c..863621177 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 %}