diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-12-06 15:36:32 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-12-06 15:41:32 +0000 |
| commit | 0ff14f85e46d789b53ef71c7aef628580e4cf334 (patch) | |
| tree | e8ae7bcafa6e590ea46dc5d22c39db56758dc648 /docker | |
| parent | 55d8828be3d3476d6f3201682796fc3883ff615b (diff) | |
| download | kolla-0ff14f85e46d789b53ef71c7aef628580e4cf334.tar.gz kolla-0ff14f85e46d789b53ef71c7aef628580e4cf334.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/macros.j2 | 10 | ||||
| -rw-r--r-- | docker/neutron/neutron-server-opendaylight/Dockerfile.j2 | 3 |
3 files changed, 2 insertions, 12 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index f2e779c8f..1423f05a1 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -163,7 +163,6 @@ RUN ln -s horizon-source/* horizon \ && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \ && cp /horizon/openstack_dashboard/local/local_settings.py.example /etc/openstack-dashboard/local_settings \ && cp /horizon/manage.py /var/lib/kolla/venv/bin/manage.py \ - {{ macros.remove_py3_only_plugins_for_py2(['searchlight-ui', 'neutron-vpnaas-dashboard']) }} && if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(horizon_plugins_pip_packages) }}; \ fi \ 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 %} 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 |