From 3915785884bd9a1746f635196a0e361cc70fbe2d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 1 Apr 2022 15:27:43 +0200 Subject: drop add_binary_source_envs() macro With binary install type dropped there is no need for this macro. Change-Id: I7bdd29eb48a23faa04a98e785129d97258f05e64 --- docker/kolla-toolbox/Dockerfile.j2 | 1 - docker/macros.j2 | 4 ---- docker/monasca/monasca-thresh/Dockerfile.j2 | 1 - docker/openstack-base/Dockerfile.j2 | 1 - 4 files changed, 7 deletions(-) (limited to 'docker') diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 507271c39..9e2a06f2f 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -10,7 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.add_binary_source_envs() }} {{ macros.configure_user(name='ansible') }} {{ macros.configure_user(name='rabbitmq') }} diff --git a/docker/macros.j2 b/docker/macros.j2 index 2c7cb2bef..20bf21aa3 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -76,7 +76,3 @@ RUN usermod --append --home {{ homedir }} --groups kolla {{ name }} \ {{ handle_repos(repos, 'disable') }} {% endmacro %} - -{% macro add_binary_source_envs() %} -ENV KOLLA_INSTALL_TYPE={{ install_type }} -{% endmacro %} diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2 index 0bf8d03a9..012a12302 100644 --- a/docker/monasca/monasca-thresh/Dockerfile.j2 +++ b/docker/monasca/monasca-thresh/Dockerfile.j2 @@ -7,7 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.add_binary_source_envs() }} {{ macros.configure_user(name='monasca') }} {% if base_package_type == 'rpm' %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 6ad13e152..b3ded9c71 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -7,7 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.add_binary_source_envs() }} {{ macros.enable_extra_repos(['opstools', 'powertools']) }} {% if base_package_type == 'rpm' %} -- cgit v1.2.3