diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-18 14:21:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-18 14:21:34 +0000 |
| commit | 29c7ef295cd840eb6895c56d7e615bd9fa5ca730 (patch) | |
| tree | 6f2e68e1c0252627b67e882666b7f6417a8d53ca | |
| parent | bcb21d289b3698a1086c892cc2e4197cb733d552 (diff) | |
| parent | a3b043af10c2383168d3d37df5f0621707c95fc6 (diff) | |
| download | kolla-29c7ef295cd840eb6895c56d7e615bd9fa5ca730.tar.gz kolla-29c7ef295cd840eb6895c56d7e615bd9fa5ca730.zip | |
Merge "Add Cinder-Volume Package for Ubuntu binary install"
| -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 |