diff options
| author | Zuul <zuul@review.opendev.org> | 2026-10-27 12:44:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-10-27 12:44:53 +0000 |
| commit | b65a746e6758c1a4a0ea2ece7946d7984a0811ec (patch) | |
| tree | a90e7aa8b714ec68249997cdf01f2ff110a54864 /kolla/docker | |
| parent | 114f68b9edc9c36bd7c1d215f17048f779669b3a (diff) | |
| parent | 4cefbac5792781e02453cd882c2872dbba371197 (diff) | |
| download | kolla-b65a746e6758c1a4a0ea2ece7946d7984a0811ec.tar.gz kolla-b65a746e6758c1a4a0ea2ece7946d7984a0811ec.zip | |
Merge "cinder-volume: add customizable pip package list"
Diffstat (limited to 'kolla/docker')
| -rw-r--r-- | kolla/docker/cinder/cinder-volume/Dockerfile.j2 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kolla/docker/cinder/cinder-volume/Dockerfile.j2 b/kolla/docker/cinder/cinder-volume/Dockerfile.j2 index 772350e4e..f2a09d866 100644 --- a/kolla/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/kolla/docker/cinder/cinder-volume/Dockerfile.j2 @@ -45,10 +45,13 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf {% endif %} +{% set cinder_volume_pip_packages = [] %} + COPY cinder_sudoers /etc/sudoers.d/kolla_cinder_volume_sudoers COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start -RUN chmod 750 /etc/sudoers.d \ +RUN {{ macros.install_pip(cinder_volume_pip_packages | customizable("pip_packages")) }} \ + && chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_cinder_volume_sudoers \ && chmod 644 /usr/local/bin/kolla_cinder_extend_start |