aboutsummaryrefslogtreecommitdiff
path: root/docker/neutron
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-03-09 17:44:54 +0100
committerMark Goddard <mark@stackhpc.com>2020-04-15 09:32:06 +0000
commit53443c5c712f4ec23b859105e94bcd90abc27762 (patch)
tree5bc6d8db4c65519e16d231b55f574e813e29da4b /docker/neutron
parenta176c6e080be2e71829e8ca5e8b330fdda70038a (diff)
downloadkolla-53443c5c712f4ec23b859105e94bcd90abc27762.tar.gz
kolla-53443c5c712f4ec23b859105e94bcd90abc27762.zip
Remove support for CentOS 7
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images so there is no need for checking which Python version (2.x or 3.x) is used inside of containers. We also no longer have to support yum as a value for distro_package_manager. Partially-Implements: blueprint centos-rhel-8 Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
Diffstat (limited to 'docker/neutron')
-rw-r--r--docker/neutron/neutron-base/Dockerfile.j225
-rw-r--r--docker/neutron/neutron-linuxbridge-agent/Dockerfile.j25
-rw-r--r--docker/neutron/neutron-mlnx-agent/Dockerfile.j227
-rw-r--r--docker/neutron/neutron-server-opendaylight/Dockerfile.j29
-rw-r--r--docker/neutron/neutron-server/Dockerfile.j29
5 files changed, 9 insertions, 66 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 3ac8c07fd..81ba036c0 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -20,10 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openstack-neutron',
'openstack-neutron-fwaas',
'openstack-neutron-ml2',
- 'openvswitch'
- ] %}
- {% if distro_python_version.startswith('3') %}
- {% set neutron_base_packages = neutron_base_packages + [
+ 'openvswitch',
'python3-networking-baremetal',
'python3-networking-mlnx',
'python3-networking-sfc',
@@ -31,16 +28,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-openvswitch',
'python3-oslo-vmware'
] %}
- {% else %}
- {% set neutron_base_packages = neutron_base_packages + [
- 'python-networking-sfc',
- 'python-networking-vmware-nsx',
- 'python2-networking-baremetal',
- 'python2-networking-mlnx',
- 'python2-openvswitch',
- 'python2-oslo-vmware'
- ] %}
- {% endif %}
{% elif base_package_type == 'deb' %}
@@ -87,18 +74,10 @@ RUN mkdir -p /usr/share/neutron \
'keepalived',
'net-tools',
'openvswitch',
+ 'python3-openvswitch',
'radvd',
'uuid'
] %}
- {% if distro_python_version.startswith('3') %}
- {% set neutron_base_packages = neutron_base_packages + [
- 'python3-openvswitch',
- ] %}
- {% else %}
- {% set neutron_base_packages = neutron_base_packages + [
- 'python2-openvswitch',
- ] %}
- {% endif %}
{% elif base_package_type == 'deb' %}
diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
index 5fe9cb630..284754a76 100644
--- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
@@ -29,11 +29,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set neutron_linuxbridge_agent_packages = [
'ebtables'
] %}
- {% if distro_package_manager != 'dnf' %}
- {% set neutron_linuxbridge_agent_packages = neutron_linuxbridge_agent_packages + [
- 'bridge-utils',
- ] %}
- {% endif %}
{% endif %}
diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
index 7a957b584..1741d6199 100644
--- a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
@@ -7,29 +7,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
-{% if distro_python_version.startswith('3') %}
- {% set neutron_mlnx_agent_packages = [
- 'python3-libvirt',
- 'python3-ethtool',
- ] %}
-{% else %}
- {% set neutron_mlnx_agent_packages = [
- 'libvirt-python',
- 'python-ethtool',
- ] %}
-{% endif %}
+{% set neutron_mlnx_agent_packages = [
+ 'python3-libvirt',
+ 'python3-ethtool',
+] %}
{% if install_type == 'binary' %}
- {% if distro_python_version.startswith('3') %}
- {% set neutron_mlnx_agent_packages = neutron_mlnx_agent_packages + [
- 'python3-networking-mlnx'
- ] %}
- {% else %}
- {% set neutron_mlnx_agent_packages = neutron_mlnx_agent_packages + [
- 'python-networking-mlnx'
- ] %}
- {% endif %}
+ {% set neutron_mlnx_agent_packages = neutron_mlnx_agent_packages + [
+ 'python3-networking-mlnx'
+ ] %}
{% endif %}
diff --git a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2 b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2
index 5c6055dce..8f86db6a6 100644
--- a/docker/neutron/neutron-server-opendaylight/Dockerfile.j2
+++ b/docker/neutron/neutron-server-opendaylight/Dockerfile.j2
@@ -11,21 +11,12 @@ USER root
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
- {% if distro_python_version.startswith('3') %}
{% set neutron_server_opendaylight_packages = [
'python3-networking-bgpvpn',
'python3-networking-bgpvpn-heat',
'python3-networking-l2gw',
'python3-networking-odl'
] %}
- {% else %}
- {% set neutron_server_opendaylight_packages = [
- 'python-networking-bgpvpn',
- 'python-networking-bgpvpn-heat',
- 'python-networking-l2gw',
- 'python-networking-odl'
- ] %}
- {% endif %}
{% elif base_package_type == 'deb' %}
{% set neutron_server_opendaylight_packages = [
'python3-networking-bgpvpn',
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index e41520088..169405148 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -11,17 +11,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set neutron_server_packages = [
'openstack-neutron-vpnaas',
- ] %}
-
- {% if distro_python_version.startswith('3') %}
- {% set neutron_server_packages = neutron_server_packages + [
'python3-networking-generic-switch'
] %}
- {% else %}
- {% set neutron_server_packages = neutron_server_packages + [
- 'python-networking-generic-switch'
- ] %}
- {% endif %}
{% elif base_package_type == 'deb' %}