From d4a5c75db6896d1b5aac25f64b26bd4ed291ee14 Mon Sep 17 00:00:00 2001
From: MD NADEEM <mail2nadeem92@gmail.com>
Date: Tue, 1 Mar 2016 10:28:34 +0530
Subject: [PATCH] Manila ubuntu binary container
manila-share is present in manila-common package.
Change-Id: Ida231c0468b6ee3bb6a76fb9f475724abf95c1cb
Closes-Bug:#1553199
---
docker/manila/manila-api/Dockerfile.j2 | 10 ++++++++++
docker/manila/manila-base/Dockerfile.j2 | 1 +
docker/manila/manila-scheduler/Dockerfile.j2 | 10 ++++++++++
3 files changed, 21 insertions(+)
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2
index 3590103a9..88269d2c8 100644
--- a/docker/manila/manila-api/Dockerfile.j2
+++ b/docker/manila/manila-api/Dockerfile.j2
@@ -1,6 +1,16 @@
FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% if install_type == 'binary' %}
+ {% if base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ manila-api \
+ && apt-get clean
+
+ {% endif%}
+{% endif%}
+
COPY extend_start.sh /usr/local/bin/kolla_manila_extend_start
RUN chmod 755 /usr/local/bin/kolla_manila_extend_start
diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2
index 83069c1f3..d971b7c86 100644
--- a/docker/manila/manila-base/Dockerfile.j2
+++ b/docker/manila/manila-base/Dockerfile.j2
@@ -12,6 +12,7 @@ RUN yum -y install \
{% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
+ manila-common \
openvswitch-switch \
&& apt-get clean
diff --git a/docker/manila/manila-scheduler/Dockerfile.j2 b/docker/manila/manila-scheduler/Dockerfile.j2
index a3ca1820b..2fd2f0a69 100644
--- a/docker/manila/manila-scheduler/Dockerfile.j2
+++ b/docker/manila/manila-scheduler/Dockerfile.j2
@@ -1,6 +1,16 @@
FROM {{ namespace }}/{{ image_prefix }}manila-base:{{ tag }}
MAINTAINER {{ maintainer }}
+{% if install_type == 'binary' %}
+ {% if base_distro in ['ubuntu'] %}
+
+RUN apt-get install -y --no-install-recommends \
+ manila-scheduler \
+ && apt-get clean
+
+ {% endif%}
+{% endif%}
+
{{ include_footer }}
USER manila
--
GitLab