openstack/kolla
Code Issues Proposed changes

cinder-volume ubuntu source build

Browse Source 
Move debian based family package installs to base_distro
from binary conditional.
This follows RedHat based family install

Closes-Bug: #1671923

Change-Id: I038b6a198d7fd0cf805b211bc32d55bfe88bd581
This commit is contained in:
Charlie Kang 2017-03-10 12:07:08 -08:00
parent 8d37c9fe35
commit 4900b2fee1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/cinder/cinder-volume/Dockerfile.j2
View File

@ -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