openstack/kolla
Code Issues Proposed changes

ironic-neutron-agent: enable for Debuntu binary

Browse Source 
Packages are available for focal and bullseye.

Change-Id: I61623748d1149adb1b096adf2fffb5a902df3181
This commit is contained in:
Mark Goddard 2021-07-06 09:56:29 +01:00 committed by Michal Arbet
parent cf78abccc0
commit 928c4648a4
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/matrix_aarch64.csv
View File

@ -26,8 +26,6 @@ heat,C,C,C,C,N,C
horizon,C,C,C,C,N,C horizon,C,C,C,C,N,C
influxdb,N,N,C,C,N,C influxdb,N,N,C,C,N,C
ironic,C,C,C,C,N,C ironic,C,C,C,C,N,C
ironic-neutron-agent,N,N,N,N,N,N
ironic-inspector,N,N,N,N,N,N
iscsid,C,C,C,C,N,C iscsid,C,C,C,C,N,C
kafka,C,C,C,C,N,C kafka,C,C,C,C,N,C
keepalived,C,C,C,C,N,C keepalived,C,C,C,C,N,C

1 Image,CentOS,,Ubuntu,,Debian
26 horizon,C,C,C,C,N,C
27 influxdb,N,N,C,C,N,C
28 ironic,C,C,C,C,N,C
ironic-neutron-agent,N,N,N,N,N,N
ironic-inspector,N,N,N,N,N,N
29 iscsid,C,C,C,C,N,C
30 kafka,C,C,C,C,N,C
31 keepalived,C,C,C,C,N,C

2
doc/source/matrix_x86.csv
View File

@ -27,8 +27,6 @@ heat,T,T,N,T,C,T
horizon,T,T,T,T,C,T horizon,T,T,T,T,C,T
influxdb,C,C,C,C,C,C influxdb,C,C,C,C,C,C
ironic,T,T,C,T,C,C ironic,T,T,C,T,C,C
ironic-neutron-agent,T,T,N,T,N,C
ironic-inspector,T,T,C,T,C,C
iscsid,T,T,T,T,C,C iscsid,T,T,T,T,C,C
kafka,C,C,C,C,C,C kafka,C,C,C,C,C,C
keepalived,T,T,T,T,C,C keepalived,T,T,T,T,C,C

1 Image,CentOS,,Ubuntu,,Debian
27 horizon,T,T,T,T,C,T
28 influxdb,C,C,C,C,C,C
29 ironic,T,T,C,T,C,C
ironic-neutron-agent,T,T,N,T,N,C
ironic-inspector,T,T,C,T,C,C
30 iscsid,T,T,T,T,C,C
31 kafka,C,C,C,C,C,C
32 keepalived,T,T,T,T,C,C

5
docker/networking-baremetal/ironic-neutron-agent/Dockerfile.j2
View File

@ -18,8 +18,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set ironic_neutron_agent_packages = [
&& /bin/false 'ironic-neutron-agent',
] %}
{% endif %} {% endif %}

1
docker/neutron/neutron-server/Dockerfile.j2
View File

@ -17,6 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set neutron_server_packages = [ {% set neutron_server_packages = [
'python3-ironic-neutron-agent',
'python3-neutron-dynamic-routing', 'python3-neutron-dynamic-routing',
'python3-neutron-vpnaas' 'python3-neutron-vpnaas'
] %} ] %}

2
kolla/image/build.py
View File

@ -138,14 +138,12 @@ UNBUILDABLE_IMAGES = {
'debian+binary': { 'debian+binary': {
"cloudkitty-base", # no support in Dockerfile "cloudkitty-base", # no support in Dockerfile
"ironic-neutron-agent", # no support in Dockerfile
"nova-serialproxy", # no binary package "nova-serialproxy", # no binary package
"tacker-base", # no binary package "tacker-base", # no binary package
}, },
'ubuntu+binary': { 'ubuntu+binary': {
"cloudkitty-base", "cloudkitty-base",
"ironic-neutron-agent",
"senlin-conductor", # no binary package "senlin-conductor", # no binary package
"senlin-health-manager", # no binary package "senlin-health-manager", # no binary package
"tacker-base", "tacker-base",

6
releasenotes/notes/debuntu-ironic-neutron-agent-6534d616b37643a8.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Adds support for the ``ironic-neutron-agent`` image in Debian and Ubuntu
binary images. Also adds support for the ``baremetal`` ML2 driver in the
``neutron-server`` image in Debian and Ubuntu binary images.