openstack/kolla
Code Issues Proposed changes

create 'add_binary_source_envs' macro and use it

Browse Source 
There is small subset of images where we need to know which install_type
or install_metatype is used. So add them only there (and their
children).

Change-Id: Ib7d5e36b958d6c8daf2989df32e29fa24b46c62a
Implements: blueprint infra-images
This commit is contained in:
Marcin Juszkiewicz 2020-07-07 13:05:33 +02:00
parent 94c8465bd5
commit 87730f8f7c
7 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

@ -24,8 +24,6 @@ LABEL kolla_version="{{ kolla_version }}"
{% block base_header %}{% endblock %} {% block base_header %}{% endblock %}
ENV KOLLA_BASE_DISTRO={{ base_distro }} \ ENV KOLLA_BASE_DISTRO={{ base_distro }} \
KOLLA_INSTALL_TYPE={{ install_type }} \
KOLLA_INSTALL_METATYPE={{ install_metatype }} \
KOLLA_DISTRO_PYTHON_VERSION={{ distro_python_version }} \ KOLLA_DISTRO_PYTHON_VERSION={{ distro_python_version }} \
KOLLA_BASE_ARCH={{ base_arch }} KOLLA_BASE_ARCH={{ base_arch }}

1
docker/kolla-toolbox/Dockerfile.j2
View File

@ -10,6 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{{ macros.add_binary_source_envs() }}
{{ macros.configure_user(name='ansible') }} {{ macros.configure_user(name='ansible') }}
{{ macros.configure_user(name='rabbitmq') }} {{ macros.configure_user(name='rabbitmq') }}

5
docker/macros.j2
View File

@ -80,3 +80,8 @@ RUN usermod --append --home {{ homedir }} --groups kolla {{ name }} \
{{ handle_repos(repos, 'disable') }} {{ handle_repos(repos, 'disable') }}
{% endmacro %} {% endmacro %}
{% macro add_binary_source_envs() %}
ENV KOLLA_INSTALL_TYPE={{ install_type }} \
KOLLA_INSTALL_METATYPE={{ install_metatype }}
{% endmacro %}

1
docker/monasca/monasca-thresh/Dockerfile.j2
View File

@ -9,6 +9,7 @@ USER root
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{{ macros.add_binary_source_envs() }}
{{ macros.configure_user(name='monasca') }} {{ macros.configure_user(name='monasca') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}

1
docker/openstack-base/Dockerfile.j2
View File

@ -7,6 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{{ macros.add_binary_source_envs() }}
{{ macros.enable_extra_repos(['opstools']) }} {{ macros.enable_extra_repos(['opstools']) }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}

2
docker/ovsdpdk/ovsdpdk/Dockerfile.j2
View File

@ -13,7 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
#TODO(sean-k-mooney) create repo via open suse build system to package #TODO(sean-k-mooney) create repo via open suse build system to package
# for centos/rhel distros. # for centos/rhel distros.
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ RUN echo 'image not yet available for {{ base_distro }}' \
&& /bin/false && /bin/false
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}

2
docker/skydive/skydive-base/Dockerfile.j2
View File

@ -12,7 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block skydive_install %} {% block skydive_install %}
{% if base_arch != 'x86_64' %} {% if base_arch != 'x86_64' %}
RUN echo '{{ install_type }} on {{ base_distro }} not yet available on non x86_64 platforms' \ RUN echo 'image on {{ base_distro }} is not yet available on non x86_64 platforms' \
&& /bin/false && /bin/false
{% else %} {% else %}
RUN curl -o /usr/bin/skydive -L "https://github.com/skydive-project/skydive/releases/download/v0.26.0/skydive" \ RUN curl -o /usr/bin/skydive -L "https://github.com/skydive-project/skydive/releases/download/v0.26.0/skydive" \