From 4900b2fee15914ff6978679b31496055efbc0588 Mon Sep 17 00:00:00 2001 From: Charlie Kang Date: Fri, 10 Mar 2017 12:07:08 -0800 Subject: 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 --- docker/cinder/cinder-volume/Dockerfile.j2 | 7 ++++--- 1 file 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 -- cgit v1.2.3