openstack/kolla
Code Issues Proposed changes

drop add_binary_source_envs() macro

Browse Source 
With binary install type dropped there is no need for this macro.

Change-Id: I7bdd29eb48a23faa04a98e785129d97258f05e64
This commit is contained in:
Marcin Juszkiewicz 2022-04-01 15:27:43 +02:00
parent 657820362d
commit 3915785884
4 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@ 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') }}

4
docker/macros.j2
View File

@ -76,7 +76,3 @@ 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 }}
{% endmacro %}

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

@ -7,7 +7,6 @@ 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='monasca') }} {{ macros.configure_user(name='monasca') }}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}

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

@ -7,7 +7,6 @@ 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', 'powertools']) }} {{ macros.enable_extra_repos(['opstools', 'powertools']) }}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}