diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-07 03:48:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-07 03:48:30 +0000 |
| commit | 40130b2e7a591931ddac366dc6f8d085e1f83e37 (patch) | |
| tree | 7c1c09718996a48da5251009407e7b7fb108efee /docker/cinder/cinder-volume | |
| parent | 61067c4da492c8791477ea667ec3bd0482661ce4 (diff) | |
| parent | 4d7814702c6d25167625d5ccbe8b494aae16010a (diff) | |
| download | kolla-40130b2e7a591931ddac366dc6f8d085e1f83e37.tar.gz kolla-40130b2e7a591931ddac366dc6f8d085e1f83e37.zip | |
Merge "Delete the extra blank lines"
Diffstat (limited to 'docker/cinder/cinder-volume')
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index ef90fcd91..060555288 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -6,12 +6,10 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set cinder_volume_packages = [ 'nfs-utils', 'scsi-target-utils' ] %} - {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} {% block cinder_volume_redhat_setup %} @@ -19,11 +17,9 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf {% endblock %} {% elif base_distro in ['ubuntu', 'debian'] %} - {% set cinder_volume_packages = [ 'tgt' ] %} - {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} {% block cinder_volume_ubuntu_setup %} @@ -34,12 +30,10 @@ 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' ] %} - {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} {% endif %} {% endif %} |
