diff options
| author | Mathias Ewald <mewald@evoila.de> | 2016-07-17 09:23:06 +0000 |
|---|---|---|
| committer | Mathias Ewald <mewald@evoila.de> | 2016-07-18 13:00:39 +0000 |
| commit | a3b043af10c2383168d3d37df5f0621707c95fc6 (patch) | |
| tree | 537b55a99301d4aa8f477a3393fc12689279569b /docker | |
| parent | 73ab6136a78d8e912ecd3e49a35b16c61f03055e (diff) | |
| download | kolla-a3b043af10c2383168d3d37df5f0621707c95fc6.tar.gz kolla-a3b043af10c2383168d3d37df5f0621707c95fc6.zip | |
Add Cinder-Volume Package for Ubuntu binary install
The cinder-volume package is not installed in the cinder-volume
container anymore for the Ubuntu binary install.
It is still there in stable/mitaka but got lost at
I7fb48c954e578772b90a2aa619c8bcfa990b3ae8
Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: Icf086b241403c1f9098f70d902484b0c565457d0
Closes-Bug: #1603361
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 73ede467f..2fe940de3 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -18,6 +18,15 @@ RUN apt-get -y install --no-install-recommends \ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf {% endif %} +{% if install_type == 'binary' %} +{% if base_distro in ['ubuntu', 'debian'] %} + +RUN apt-get -y install --no-install-recommends \ + cinder-volume \ + && apt-get clean + +{% endif %} +{% endif %} COPY cinder_sudoers /etc/sudoers.d/cinder_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start |