diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-15 12:09:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-15 12:09:26 +0000 |
| commit | 53bd6e45e30869ba7995e7a7bf75e2dc94228aef (patch) | |
| tree | 7754f8aa5e17b1f0ebbff17679f10176eea44d1f | |
| parent | a0c77ad6d0a32f629fc2e55d094c19742be72e24 (diff) | |
| parent | 4900b2fee15914ff6978679b31496055efbc0588 (diff) | |
| download | kolla-53bd6e45e30869ba7995e7a7bf75e2dc94228aef.tar.gz kolla-53bd6e45e30869ba7995e7a7bf75e2dc94228aef.zip | |
Merge "cinder-volume ubuntu source build"
| -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 |