openstack
/
kolla
Code Issues Proposed changes

Customizations for murano 

This patchset contains customization of Dockerfiles
of murano containers

Change-Id: I5443c76627d700652a883409dce34a1511f50728
Partially-implements: blueprint third-party-plugin-support
This commit is contained in:
Swapnil Kulkarni (coolsvap) 2016-07-23 14:52:29 +05:30
parent 5a21032fb0
commit 0ec7218b19
3 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,25 +1,23 @@
FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openstack-murano-api \
&& yum clean all
{% set murano_api_packages = ['openstack-murano-api'] %}
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
murano-api \
&& apt-get clean
{% set murano_api_packages = ['murano-api'] %}
{% endif %}
RUN {{ macros.install_packages(murano_api_packages | customizable("packages")) }}
{% endif %}
COPY extend_start.sh /usr/local/bin/kolla_murano_extend_start
RUN chmod 755 /usr/local/bin/kolla_murano_extend_start
{% block murano_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}
USER murano

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

@ -1,20 +1,18 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openstack-murano-common \
&& yum clean all
{% set murano_base_packages = ['openstack-murano-common'] %}
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
murano-common \
&& apt-get clean
{% set murano_base_packages = ['murano-common'] %}
{% endif %}
RUN {{ macros.install_packages(murano_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD murano-base-archive /murano-base-source
@ -32,3 +30,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN usermod -a -G kolla murano \
&& touch /usr/local/bin/kolla_murano_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_murano_extend_start
{% block murano_base_footer %}{% endblock %}
{% block footer %}{% endblock %}

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

@ -1,22 +1,21 @@
FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }}
MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
RUN yum -y install \
openstack-murano-engine \
&& yum clean all
{% set murano_engine_packages = ['openstack-murano-engine'] %}
{% elif base_distro in ['ubuntu'] %}
RUN apt-get -y install --no-install-recommends \
murano-engine \
&& apt-get clean
{% set murano_engine_packages = ['murano-engine'] %}
{% endif %}
RUN {{ macros.install_packages(murano_engine_packages | customizable("packages")) }}
{% endif %}
{% block murano_engine_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}
USER murano