Use python3-openvswitch from distro
We should use the same Python OVS bindings package version as running OpenvSwitch. See related bug. Closes-Bug: #1961874 Change-Id: Id6968e3ec1093f26f25f3045e2a6d8cc4f41adaa
This commit is contained in:
parent
a9278d5437
commit
8e8a499adc
|
@ -53,7 +53,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{% if base_package_type == 'rpm' %}
|
{% if base_package_type == 'rpm' %}
|
||||||
|
|
||||||
{% set nova_base_packages = [
|
{% set nova_base_packages = [
|
||||||
'openvswitch'
|
'openvswitch',
|
||||||
|
'python3-openvswitch'
|
||||||
] %}
|
] %}
|
||||||
{% if base_arch == 'x86_64' %}
|
{% if base_arch == 'x86_64' %}
|
||||||
{% set nova_base_packages = nova_base_packages + [
|
{% set nova_base_packages = nova_base_packages + [
|
||||||
|
@ -74,7 +75,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
'iptables',
|
'iptables',
|
||||||
'openssh-client',
|
'openssh-client',
|
||||||
'openvswitch-switch',
|
'openvswitch-switch',
|
||||||
'python3-libvirt'
|
'python3-libvirt',
|
||||||
|
'python3-openvswitch'
|
||||||
] %}
|
] %}
|
||||||
{% if base_arch == 'x86_64' %}
|
{% if base_arch == 'x86_64' %}
|
||||||
{% set nova_base_packages = nova_base_packages + [
|
{% set nova_base_packages = nova_base_packages + [
|
||||||
|
|
|
@ -24,6 +24,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
||||||
{{ macros.install_packages(octavia_base_packages | customizable("packages")) }}
|
{{ macros.install_packages(octavia_base_packages | customizable("packages")) }}
|
||||||
|
|
||||||
{% elif install_type == 'source' %}
|
{% elif install_type == 'source' %}
|
||||||
|
{% set octavia_base_packages = [
|
||||||
|
'python3-openvswitch'
|
||||||
|
] %}
|
||||||
|
|
||||||
|
{{ macros.install_packages(octavia_base_packages | customizable("packages")) }}
|
||||||
|
|
||||||
ADD octavia-base-archive /octavia-base-source
|
ADD octavia-base-archive /octavia-base-source
|
||||||
|
|
||||||
{% set octavia_base_pip_packages = [
|
{% set octavia_base_pip_packages = [
|
||||||
|
|
|
@ -317,6 +317,11 @@ ENV DEBIAN_FRONTEND noninteractive
|
||||||
|
|
||||||
ADD openstack-base-archive /openstack-base-source
|
ADD openstack-base-archive /openstack-base-source
|
||||||
RUN ln -s openstack-base-source/* /requirements \
|
RUN ln -s openstack-base-source/* /requirements \
|
||||||
|
{# NOTE(mnasiadka): Remove ovs from upper-constraints.txt because python3-openvswitch
|
||||||
|
is usually newer than UC entry and older version would get installed
|
||||||
|
in venv (see https://launchpad.net/bugs/1961874).
|
||||||
|
#}
|
||||||
|
&& sed -i /^ovs=/d /requirements/upper-constraints.txt \
|
||||||
&& mkdir -p /var/lib/kolla \
|
&& mkdir -p /var/lib/kolla \
|
||||||
&& {{ macros.install_pip(['virtualenv'])}} \
|
&& {{ macros.install_pip(['virtualenv'])}} \
|
||||||
&& virtualenv --system-site-packages /var/lib/kolla/venv
|
&& virtualenv --system-site-packages /var/lib/kolla/venv
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixes an issue when older version of Python OpenvSwitch bindings package
|
||||||
|
was used, than the running OpenvSwitch code.
|
||||||
|
`LP#1961874 <https://launchpad.net/bugs/1961874>`__
|
Loading…
Reference in New Issue