diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-14 10:47:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-14 10:47:28 +0000 |
| commit | 9bc0ad0741cb0b5db18b39165fea60d77b19a2da (patch) | |
| tree | ef2967ea8b95c1466f8fb7162c3fa63364b5b810 /docker | |
| parent | 6d057c2884bcb37143c1f8947be5db19503ee8c9 (diff) | |
| parent | 4a39e5f3a3d14c1d56a7b14cd26bac60ed575f6c (diff) | |
| download | kolla-9bc0ad0741cb0b5db18b39165fea60d77b19a2da.tar.gz kolla-9bc0ad0741cb0b5db18b39165fea60d77b19a2da.zip | |
Merge "Allow operators to customise pip packages in nova_compute"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 46e280a5f..3962ad046 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -79,7 +79,12 @@ RUN mkdir -p /etc/ceph {{ macros.install_packages(nova_compute_packages | customizable("packages")) }} -RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt libvirt-python +{% set nova_compute_pip_packages = [ + 'libvirt-python' + ] +%} + +{{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages")) }} {% endif %} |