openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add support for murano binary containers for rpm based distros"

Browse Source
This commit is contained in:
Jenkins 2016-05-27 21:21:15 +00:00 committed by Gerrit Code Review
commit 4db24f4900
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/murano/murano-api/Dockerfile.j2
View File

@ -2,7 +2,13 @@ FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% 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 -y install --no-install-recommends \ RUN apt-get -y install --no-install-recommends \
murano-api \ murano-api \

13
docker/murano/murano-base/Dockerfile.j2
View File

@ -2,17 +2,18 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% 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 -y install --no-install-recommends \ RUN apt-get -y install --no-install-recommends \
murano-common \ murano-common \
&& apt-get clean && apt-get clean
{% else %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}

8
docker/murano/murano-engine/Dockerfile.j2
View File

@ -2,7 +2,13 @@ FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% 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 -y install --no-install-recommends \ RUN apt-get -y install --no-install-recommends \
murano-engine \ murano-engine \

7
tests/test_build.py
View File

@ -67,8 +67,7 @@ class BuildTest(object):
class BuildTestCentosBinary(BuildTest, base.BaseTestCase): class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
excluded_images = ["murano-base", excluded_images = []
"murano-base"]
def setUp(self): def setUp(self):
super(BuildTestCentosBinary, self).setUp() super(BuildTestCentosBinary, self).setUp()
@ -78,7 +77,6 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
class BuildTestCentosSource(BuildTest, base.BaseTestCase): class BuildTestCentosSource(BuildTest, base.BaseTestCase):
excluded_images = ["gnocchi-base", excluded_images = ["gnocchi-base",
"murano-base",
"mistral-base"] "mistral-base"]
def setUp(self): def setUp(self):
@ -107,8 +105,7 @@ class BuildTestUbuntuSource(BuildTest, base.BaseTestCase):
class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase): class BuildTestOracleLinuxBinary(BuildTest, base.BaseTestCase):
excluded_images = ["murano-base", excluded_images = []
"murano-base"]
def setUp(self): def setUp(self):
super(BuildTestOracleLinuxBinary, self).setUp() super(BuildTestOracleLinuxBinary, self).setUp()