aboutsummaryrefslogtreecommitdiff
path: root/docker/keystone
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2018-01-23 14:15:51 +0100
committerMartin André <m.andre@redhat.com>2018-01-23 14:15:51 +0100
commit6b81f91c5e3de7c9641c0b45e6c35ff45813a764 (patch)
tree69efd1ed18335f73321c6b6984ff01439235b1c1 /docker/keystone
parent9093c7bd4c6fc9cd87837a1e09e9ffda4a6a69cf (diff)
downloadkolla-6b81f91c5e3de7c9641c0b45e6c35ff45813a764.tar.gz
kolla-6b81f91c5e3de7c9641c0b45e6c35ff45813a764.zip
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
Diffstat (limited to 'docker/keystone')
-rw-r--r--docker/keystone/keystone/Dockerfile.j22
1 files changed, 1 insertions, 1 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 %}