diff options
| author | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2016-05-17 11:59:53 +0530 |
|---|---|---|
| committer | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2016-05-25 12:26:39 +0000 |
| commit | 9774ca92f8c8ea9e125ea5d49ac456d599613a6b (patch) | |
| tree | e52f93194b2e6c097c4087e344397a7f78fc5b8c /docker/murano | |
| parent | ca1a0551bcdb0b0b97d7c6f064dda4cd1aafd40a (diff) | |
| download | kolla-9774ca92f8c8ea9e125ea5d49ac456d599613a6b.tar.gz kolla-9774ca92f8c8ea9e125ea5d49ac456d599613a6b.zip | |
Add support for murano binary containers for rpm based distros
Change-Id: I0b916d238f28fe1b536abfb01228b24dbabe8b91
Depends-On: If4be00b937e14ec93443dcb7249cf17099d57cbe
Closes-Bug:#1582537
Diffstat (limited to 'docker/murano')
| -rw-r--r-- | docker/murano/murano-api/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/murano/murano-base/Dockerfile.j2 | 13 | ||||
| -rw-r--r-- | docker/murano/murano-engine/Dockerfile.j2 | 8 |
3 files changed, 21 insertions, 8 deletions
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index 76b23f939..d02e4b3aa 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 26fc7618e..d9737c1df 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 c3a1557ec..6bd67f8c9 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 \ |