diff options
| author | Zuul <zuul@review.openstack.org> | 2018-03-02 09:08:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-03-02 09:08:08 +0000 |
| commit | 2d90a021c9c56c15203ee9701ddef6ab17c47be7 (patch) | |
| tree | 4459eed6ec7d89c29b6205ebedff38ede47da7cb /docker | |
| parent | 8caa2ce04844456ed76e126ed20c65bc3f46f2e7 (diff) | |
| parent | cb596314146944aca3f4114242a0840d2952d382 (diff) | |
| download | kolla-2d90a021c9c56c15203ee9701ddef6ab17c47be7.tar.gz kolla-2d90a021c9c56c15203ee9701ddef6ab17c47be7.zip | |
Merge "Need to install cryptsetup for cinder"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index a17aa656c..2fbf24b5b 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -12,6 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set cinder_base_packages = [ 'ceph-common', 'lvm2', + 'cryptsetup', 'openstack-cinder', 'python-automaton', 'python-oslo-vmware' @@ -21,6 +22,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'ceph-common', 'cinder-common', 'lvm2', + 'cryptsetup', 'python-oslo.vmware' ] %} {% endif %} @@ -31,12 +33,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set cinder_base_packages = [ 'ceph-common', 'lvm2', + 'cryptsetup', 'qemu-img' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set cinder_base_packages = [ 'ceph-common', 'lvm2', + 'cryptsetup', 'qemu-utils' ] %} {% endif %} |