openstack/kolla
Code Issues Proposed changes

ovn: Add Debian x86 images

Browse Source 
aarch64 still has no installation candidate

Change-Id: I645f5d04ff2be3a5857765e901eccfe0b56ff199
This commit is contained in:
Michal Nasiadka 2021-10-21 13:33:59 +02:00 committed by Radosław Piliszek
parent 6014b503dd
commit 3df1a1dde9
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/matrix_x86.csv
View File

@ -49,7 +49,7 @@ nova,T,T,T,T,C,T
nova-spicehtml5proxy,N,N,T,T,C,T nova-spicehtml5proxy,N,N,T,T,C,T
octavia,C,C,N,C,C,C octavia,C,C,N,C,C,C
openvswitch,T,T,T,T,C,T openvswitch,T,T,T,T,C,T
ovn,C,C,C,C,N,N ovn,C,C,C,C,C,C
ovsdpdk,N,N,C,C,C,C ovsdpdk,N,N,C,C,C,C
placement,T,T,T,T,C,T placement,T,T,T,T,C,T
prometheus,C,C,C,C,C,C prometheus,C,C,C,C,C,C

1 Image,CentOS,,Ubuntu,,Debian
49 nova-spicehtml5proxy,N,N,T,T,C,T
50 octavia,C,C,N,C,C,C
51 openvswitch,T,T,T,T,C,T
52 ovn,C,C,C,C,N,N ovn,C,C,C,C,C,C
53 ovsdpdk,N,N,C,C,C,C
54 placement,T,T,T,T,C,T
55 prometheus,C,C,C,C,C,C

8
docker/ovn/ovn-base/Dockerfile.j2
View File

@ -12,13 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch-ovn-common', 'openvswitch-ovn-common',
] %} ] %}
{% elif base_distro in ['debian'] %} {% elif base_package_type == 'deb' %}
# NOTE(hrw): 'ovn-common' is provided by 'openvswitch-common'
{% set ovn_base_packages = [
'openvswitch-common',
] %}
{% elif base_distro in ['ubuntu'] %}
{% set ovn_base_packages = [ {% set ovn_base_packages = [
'ovn-common', 'ovn-common',
] %} ] %}

5
kolla/image/build.py
View File

@ -113,7 +113,6 @@ UNBUILDABLE_IMAGES = {
'debian': { 'debian': {
"bifrost-base", # tries to install 'mysql-server' which is not in "bifrost-base", # tries to install 'mysql-server' which is not in
# Debian 'buster' (fixed in Yoga) # Debian 'buster' (fixed in Yoga)
"ovn-base", # no OVN package in Debian bullseye
"qdrouterd", # no qdrouterd package in Debian bullseye "qdrouterd", # no qdrouterd package in Debian bullseye
}, },
@ -121,6 +120,10 @@ UNBUILDABLE_IMAGES = {
"qdrouterd", # There is no qdrouterd package for Ubuntu "qdrouterd", # There is no qdrouterd package for Ubuntu
}, },
'debian+aarch64': {
"ovn-base", # no binary package
},
'ubuntu+aarch64': { 'ubuntu+aarch64': {
"kibana", # no binary package "kibana", # no binary package
}, },

4
releasenotes/notes/ovn-debian-x86-d584f88b9e94b226.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
OVN images are now buildable for Debian x86.