From a3b043af10c2383168d3d37df5f0621707c95fc6 Mon Sep 17 00:00:00 2001
From: Mathias Ewald <mewald@evoila.de>
Date: Sun, 17 Jul 2016 09:23:06 +0000
Subject: [PATCH] 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
---
docker/cinder/cinder-volume/Dockerfile.j2 | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index 73ede467f6..2fe940de33 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -17,6 +17,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
--
GitLab