diff options
| author | Charlie Kang <charlie.kang@intel.com> | 2017-03-10 12:07:08 -0800 |
|---|---|---|
| committer | Charlie Kang <charlie.kang@intel.com> | 2017-03-11 19:23:58 +0000 |
| commit | 4900b2fee15914ff6978679b31496055efbc0588 (patch) | |
| tree | 1a4b4e07aba1e4fe61cca5cd4514489c6e7300b9 /docker/cinder | |
| parent | 8d37c9fe3500627684225a00aa8a94446c78eec3 (diff) | |
| download | kolla-4900b2fee15914ff6978679b31496055efbc0588.tar.gz kolla-4900b2fee15914ff6978679b31496055efbc0588.zip | |
cinder-volume ubuntu source build
Move debian based family package installs to base_distro
from binary conditional.
This follows RedHat based family install
Closes-Bug: #1671923
Change-Id: I038b6a198d7fd0cf805b211bc32d55bfe88bd581
Diffstat (limited to 'docker/cinder')
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index c4f994d5b..184eeb6e1 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -18,7 +18,8 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf {% elif base_distro in ['ubuntu', 'debian'] %} {% set cinder_volume_packages = [ - 'tgt' + 'tgt', + 'nfs-common' ] %} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} @@ -31,11 +32,11 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf {% if install_type == 'binary' %} {% if base_distro in ['ubuntu', 'debian'] %} {% set cinder_volume_packages = [ - 'cinder-volume', - 'nfs-common' + 'cinder-volume' ] %} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} {% endif %} + {% endif %} COPY cinder_sudoers /etc/sudoers.d/kolla_cinder_volume_sudoers |