From 0ff14f85e46d789b53ef71c7aef628580e4cf334 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 6 Dec 2019 15:36:32 +0000 Subject: Revert "Introduce macro to remove Py3 only plugins on CentOS 7" This reverts the following commits: df987c9d3fca40e0a7529e48a3626dfdd58e2168 d866c63a32a494b8643b166c3b1e36e463a7502f 6b40b655f124d0a95f1b7d89ce04236606a02010 These are no longer necessary as we are using stable/train branch for source images until CentOS 8 / python 3 support is available and working. Change-Id: I5aedf1141862d51c5bb676a7393fc131c452c914 Related: blueprint centos-rhel-python-3 --- docker/macros.j2 | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'docker/macros.j2') diff --git a/docker/macros.j2 b/docker/macros.j2 index f52ff2235..8c698d278 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -97,13 +97,3 @@ RUN usermod --append --home {{ homedir }} --groups kolla {{ name }} \ {{ enable_repos(repos) }} {% endmacro %} - -# NOTE(hrw): ending \ has to be at the end as we generate one line and there -# can be multiple plugins to remove -{% macro remove_py3_only_plugins_for_py2(plugins_to_remove) -%} - {% if distro_python_version == '2.7' -%} - {% for plugin in plugins_to_remove %}&& rm -rf /plugins/{{ plugin }}* {% endfor %} \ - {%- else -%} - \ - {%- endif %} -{%- endmacro %} -- cgit v1.2.3