openstack/kolla-ansible
Code Issues Proposed changes

Customizations for magnum

Browse Source 
This patchset contains customization of Dockerfile of magnum
containers

Change-Id: I0655cab1f1fc12bc109a49a20874170b5a99125e
Partially-implements: blueprint third-party-plugin-support
Signed-off-by: Eduardo Gonzalez <dabarren@gmail.com>
This commit is contained in:
Eduardo Gonzalez 2016-08-05 07:39:37 +02:00
parent 34a4692299
commit 5b45d47369
3 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/magnum/magnum-api/Dockerfile.j2
View File

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

16
docker/magnum/magnum-base/Dockerfile.j2
View File

@ -1,21 +1,17 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
{% set magnum_base_packages = ['openstack-magnum-common'] %}
RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean.repo \ RUN curl -L https://trunk.rdoproject.org/centos7/current/delorean.repo -o /etc/yum.repos.d/delorean.repo
&& yum -y install \
openstack-magnum-common \
&& yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set magnum_base_packages = ['magnum-common'] %}
RUN apt-get -y install --no-install-recommends \
magnum-common \
&& apt-get clean
{% endif %} {% endif %}
RUN {{ macros.install_packages(magnum_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
ADD magnum-base-archive /magnum-base-source ADD magnum-base-archive /magnum-base-source

19
docker/magnum/magnum-conductor/Dockerfile.j2
View File

@ -1,21 +1,18 @@
FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}magnum-base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set magnum_conductor_packages = [
RUN yum -y install \ 'openstack-magnum-conductor',
openstack-magnum-conductor \ 'tar'
tar \ ] %}
&& yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set magnum_conductor_packages = ['magnum-conductor'] %}
RUN apt-get -y install --no-install-recommends \
magnum-conductor\
&& apt-get clean
{% endif %} {% endif %}
RUN {{ macros.install_packages(magnum_conductor_packages | customizable("packages")) }}
# Install kubectl binary (ugh) # Install kubectl binary (ugh)
RUN cd /tmp \ RUN cd /tmp \
@ -26,6 +23,8 @@ RUN cd /tmp \
{% endif %} {% endif %}
{% block magnum_conductor_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER magnum USER magnum