From 9774ca92f8c8ea9e125ea5d49ac456d599613a6b Mon Sep 17 00:00:00 2001
From: "Swapnil Kulkarni (coolsvap)" <me@coolsvap.net>
Date: Tue, 17 May 2016 11:59:53 +0530
Subject: [PATCH] Add support for murano binary containers for rpm based
distros
Change-Id: I0b916d238f28fe1b536abfb01228b24dbabe8b91
Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug:#1582537
---
docker/murano/murano-api/Dockerfile.j2 | 8 +++++++-
docker/murano/murano-base/Dockerfile.j2 | 13 +++++++------
docker/murano/murano-engine/Dockerfile.j2 | 8 +++++++-
tests/test_build.py | 7 ++-----
4 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2
index 76b23f9390..d02e4b3aa8 100644
--- a/docker/murano/murano-api/Dockerfile.j2
+++ b/docker/murano/murano-api/Dockerfile.j2
@@ -2,7 +2,13 @@ FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
- {% if base_distro in ['ubuntu'] %}
+ {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+
+RUN yum -y install \
+ openstack-murano-api \
+ && yum clean all
+
+ {% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
murano-api \
diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2
index 26fc7618ea..d9737c1dff 100644
--- a/docker/murano/murano-base/Dockerfile.j2
+++ b/docker/murano/murano-base/Dockerfile.j2
@@ -2,17 +2,18 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
- {% if base_distro in ['ubuntu'] %}
+ {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+
+RUN yum -y install \
+ openstack-murano-common \
+ && yum clean all
+
+ {% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
murano-common \
&& apt-get clean
- {% else %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
- && /bin/false
-
{% endif %}
{% elif install_type == 'source' %}
diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2
index c3a1557ec0..6bd67f8c93 100644
--- a/docker/murano/murano-engine/Dockerfile.j2
+++ b/docker/murano/murano-engine/Dockerfile.j2
@@ -2,7 +2,13 @@ FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
- {% if base_distro in ['ubuntu'] %}
+ {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+
+RUN yum -y install \
+ openstack-murano-engine \
+ && yum clean all
+
+ {% elif base_distro in ['ubuntu'] %}
RUN apt-get install -y --no-install-recommends \
murano-engine \
diff --git a/tests/test_build.py b/tests/test_build.py
index f24e6a9fc2..fd56fa0bb0 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -67,8 +67,7 @@ class BuildTest(object):
class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
- excluded_images = ["murano-base",
- "murano-base"]
+ excluded_images = []
def setUp(self):
super(BuildTestCentosBinary, self).setUp()
@@ -78,7 +77,6 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
class BuildTestCentosSource(BuildTest, base.BaseTestCase):
excluded_images = ["gnocchi-base",
- "murano-base",
"mistral-base"]
def setUp(self):
@@ -108,8 +106,7 @@ class BuildTestUbuntuSource(BuildTest, base.BaseTestCase):
class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
- excluded_images = ["murano-base",
- "murano-base"]
+ excluded_images = []
def setUp(self):
super(BuildTestOracleLinuxBinary, self).setUp()