diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index b8e1576748..c8827cfda3 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 -y install --no-install-recommends \ murano-api \ diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 6201fb0709..98b6dbbd0b 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 -y install --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 33342cb963..b7df4ce61f 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 -y install --no-install-recommends \ murano-engine \ diff --git a/tests/test_build.py b/tests/test_build.py index ae97a25573..521f26c16b 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): @@ -107,8 +105,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()