diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-12-05 12:40:05 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-12-05 14:48:05 +0100 |
| commit | df987c9d3fca40e0a7529e48a3626dfdd58e2168 (patch) | |
| tree | e01df923ff8df4b6240ae66723b498350a01759c /docker/neutron | |
| parent | 324ea9e2baec0a135fc0096922ffd498fda53eeb (diff) | |
| download | kolla-df987c9d3fca40e0a7529e48a3626dfdd58e2168.tar.gz kolla-df987c9d3fca40e0a7529e48a3626dfdd58e2168.zip | |
Introduce macro to remove Py3 only plugins on CentOS 7
As CentOS 7 is Python 2 we need a way to remove plugins used in
OpenStack components once they switch to be Python 3 only.
'remove_py3_only_plugins_for_py2' macro does exactly that.
This change also disables networking-bgpvpn for python 2.
Change-Id: Ib90aabc485f1c831d3d41cc0f70052f8fffc3fe6
Related: blueprint drop-py2-support
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-server-opendaylight/Dockerfile.j2 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 index 287274a5e..da032f8d4 100644 --- a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 +++ b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 @@ -18,8 +18,6 @@ USER root ] %} {% else %} {% set neutron_server_opendaylight_packages = [ - 'python-networking-bgpvpn', - 'python-networking-bgpvpn-heat', 'python-networking-l2gw', 'python-networking-odl' ] %} @@ -58,6 +56,7 @@ 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 |