openstack/kayobe
Code Issues Proposed changes

Use naming convention to infer VLAN tagging

Browse Source 
Any interface not matching the convention: <interface>.<vlan id> will be
assumed to untagged when generating the config drive. The link type will
be set to `phy` in `network_data.json` instead of `vlan`. This prevents
invalid config drive configuration from being generated.

Change-Id: I00e7615581c7a214e0ee8e8f04cacdbb3ea4131a
Story: 2009910
Task: 44736
This commit is contained in:
Will Szumski 2022-03-10 12:22:48 +00:00 committed by Pierre Riteau
parent 678b915aff
commit dd956189ed
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kayobe/plugins/filter/networks.py
View File

@ -595,7 +595,7 @@ def net_configdrive_network_device(context, name, inventory_hostname=None):
bootproto = net_bootproto(context, name, inventory_hostname) bootproto = net_bootproto(context, name, inventory_hostname)
mtu = net_mtu(context, name, inventory_hostname) mtu = net_mtu(context, name, inventory_hostname)
vlan = net_vlan(context, name, inventory_hostname) vlan = net_vlan(context, name, inventory_hostname)
if vlan: if vlan and '.' in device:
backend = [device.split('.')[0]] backend = [device.split('.')[0]]
else: else:
backend = None backend = None
@ -608,7 +608,7 @@ def net_configdrive_network_device(context, name, inventory_hostname=None):
'mtu': mtu, 'mtu': mtu,
'backend': backend, 'backend': backend,
} }
if vlan: if backend:
interface['type'] = 'vlan' interface['type'] = 'vlan'
interface = {k: v for k, v in interface.items() if v is not None} interface = {k: v for k, v in interface.items() if v is not None}
return interface return interface

8
releasenotes/notes/fixes-keyerror-vlan-link-c177cf719e070df6.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
Fixes an issue with config drive generation for infrastructure and seed VMs
when using untagged interfaces. The symptom of this issue is that kayobe
cannot login to the instance. If you check the libvirt console log, you
will see ``KeyError: 'vlan_link'``. See `story 2009910
<https://storyboard.openstack.org/#!/story/2009910>`__ for details.