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/neutron/neutron-server-opendaylight/Dockerfile.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker/neutron') diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 index da032f8d4..287274a5e 100644 --- a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 +++ b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 @@ -18,6 +18,8 @@ USER root ] %} {% else %} {% set neutron_server_opendaylight_packages = [ + 'python-networking-bgpvpn', + 'python-networking-bgpvpn-heat', 'python-networking-l2gw', 'python-networking-odl' ] %} @@ -56,7 +58,6 @@ ADD plugins-archive / RUN if [ "$(ls /plugins)" ]; then \ sed -i 's|^ceilometer===.*$||g' requirements/upper-constraints.txt \ - {{ macros.remove_py3_only_plugins_for_py2(['networking-bgpvpn']) }} && {{ macros.install_pip(neutron_server_opendaylight_plugins_pip_packages) }}; \ fi -- cgit v1.2.3