aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-12-10 13:23:48 +0000
committerGerrit Code Review <review@openstack.org>2019-12-10 13:23:48 +0000
commit888833a7f06fde36ad90d6222e1c732ad48761cb (patch)
tree082e7e3aa78a825efd45866d483bafdf6b46edb5
parent18fd9b5147088b357cca0216e07ae175420a4212 (diff)
parent0ff14f85e46d789b53ef71c7aef628580e4cf334 (diff)
downloadkolla-888833a7f06fde36ad90d6222e1c732ad48761cb.tar.gz
kolla-888833a7f06fde36ad90d6222e1c732ad48761cb.zip
Merge "Revert "Introduce macro to remove Py3 only plugins on CentOS 7""
-rw-r--r--docker/horizon/Dockerfile.j21
-rw-r--r--docker/macros.j210
-rw-r--r--docker/neutron/neutron-server-opendaylight/Dockerfile.j23
-rwxr-xr-xkolla/image/build.py4
4 files changed, 2 insertions, 16 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
diff --git a/kolla/image/build.py b/kolla/image/build.py
index b29450edd..6c76eeb6b 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -140,10 +140,6 @@ UNBUILDABLE_IMAGES = {
"ovsdpdk",
},
- 'centos+source': {
- "searchlight-base",
- },
-
'debian': {
"bifrost-base", # tries to install 'mysql-server' which is not in
# Debian 'buster'