From 6b81f91c5e3de7c9641c0b45e6c35ff45813a764 Mon Sep 17 00:00:00 2001 From: Martin André Date: Tue, 23 Jan 2018 14:15:51 +0100 Subject: Remove customizable for plugins_pip_packages The pip packages are normally already configurable with the _pip_packages variable. It doesn't make much sense to make the list of packages installed with the plugins mechanism configurable via the _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/nova/nova-compute/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/nova') diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 758c30e79..c6b1d67a3 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 %} -- cgit v1.2.3