aboutsummaryrefslogtreecommitdiff
path: root/docker/neutron
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-01-30 20:13:03 +0000
committerGerrit Code Review <review@openstack.org>2020-01-30 20:13:03 +0000
commite97239f03e734195a49b383f0e77aae3bdea9a35 (patch)
tree6e642b2c4dc807e60d5b3ba84d0d5defa6b9a8ca /docker/neutron
parent63ad9cd0de0926f401a7f26bff505b1629f2e520 (diff)
parent4b4e26262b9e03190c639481fb60a8f4f92c532a (diff)
downloadkolla-e97239f03e734195a49b383f0e77aae3bdea9a35.tar.gz
kolla-e97239f03e734195a49b383f0e77aae3bdea9a35.zip
Merge "CentOS 8: Update packages in images"
Diffstat (limited to 'docker/neutron')
-rw-r--r--docker/neutron/neutron-base/Dockerfile.j211
-rw-r--r--docker/neutron/neutron-linuxbridge-agent/Dockerfile.j26
2 files changed, 15 insertions, 2 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 20ef42454..76649730e 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -83,14 +83,23 @@ RUN mkdir -p /usr/share/neutron \
'dnsmasq-utils',
'haproxy',
'ipset',
+ 'iptables',
'iputils',
'keepalived',
'net-tools',
'openvswitch',
- 'python2-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 a486fd5f9..514e88f3e 100644
--- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
@@ -25,9 +25,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif install_type == 'source' %}
{% set neutron_linuxbridge_agent_packages = [
- 'bridge-utils',
'ebtables'
] %}
+ {% if distro_package_manager != 'dnf' %}
+ {% set neutron_linuxbridge_agent_packages = neutron_linuxbridge_agent_packages + [
+ 'bridge-utils',
+ ] %}
+ {% endif %}
{% endif %}