From b60d8bc629e6c5947c3c722c3eb320de8656a277 Mon Sep 17 00:00:00 2001
From: "Swapnil Kulkarni (coolsvap)" <me@coolsvap.net>
Date: Tue, 17 May 2016 10:37:08 +0530
Subject: [PATCH] Add support for magnum ubuntu binary containers
Change-Id: I5ad90f96aa58a99765feb2a3bc96157a4a61310f
Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug:#1582518
---
docker/magnum/magnum-api/Dockerfile.j2 | 6 ++++++
docker/magnum/magnum-base/Dockerfile.j2 | 6 ++++++
docker/magnum/magnum-conductor/Dockerfile.j2 | 9 ++++++++-
tests/test_build.py | 1 -
4 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/docker/magnum/magnum-api/Dockerfile.j2 b/docker/magnum/magnum-api/Dockerfile.j2
index beeed5d7fb..16b8bf7656 100644
--- a/docker/magnum/magnum-api/Dockerfile.j2
+++ b/docker/magnum/magnum-api/Dockerfile.j2
@@ -8,6 +8,12 @@ RUN yum -y install \
openstack-magnum-api \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get -y install --no-install-recommends \
+ magnum-api\
+ && apt-get clean
+
{% endif %}
{% endif %}
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2
index dbb66ddedf..a6f83fab5e 100644
--- a/docker/magnum/magnum-base/Dockerfile.j2
+++ b/docker/magnum/magnum-base/Dockerfile.j2
@@ -9,6 +9,12 @@ RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/y
openstack-magnum-common \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get -y install --no-install-recommends \
+ magnum-common \
+ && apt-get clean
+
{% endif %}
{% elif install_type == 'source' %}
diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2
index d0312f22d3..c71ac3fb79 100644
--- a/docker/magnum/magnum-conductor/Dockerfile.j2
+++ b/docker/magnum/magnum-conductor/Dockerfile.j2
@@ -9,6 +9,14 @@ RUN yum -y install \
tar \
&& yum clean all
+ {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get -y install --no-install-recommends \
+ magnum-conductor\
+ && apt-get clean
+
+ {% endif %}
+
# Install kubectl binary (ugh)
RUN cd /tmp \
&& curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz \
@@ -16,7 +24,6 @@ RUN cd /tmp \
&& cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl \
&& rm -rf /tmp/kubernetes
- {% endif %}
{% endif %}
{{ include_footer }}
diff --git a/tests/test_build.py b/tests/test_build.py
index f24e6a9fc2..ae97a25573 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -89,7 +89,6 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase):
class BuildTestUbuntuBinary(BuildTest, base.BaseTestCase):
excluded_images = ["mistral-base",
- "magnum-base",
"zaqar"]
def setUp(self):