cloud-init-dev team mailing list archive

[Tobias Koch <tobias.koch@xxxxxxxxxxxxx>]

Tobias Koch has proposed merging ~tobijk/cloud-init/+git/cloud-init:master into cloud-init:master.

Commit message:
helpers/openstack.py: ignore unknown network link types in convert_net_json
    
On encountering an unknown link type, this function raised a ValueError which would prevent further processing of link types and interrupt cloud-init execution resulting in an inconsistent system state.
    
Change this to only log a warning to the console and continue processing.

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~tobijk/cloud-init/+git/cloud-init/+merge/354752
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~tobijk/cloud-init/+git/cloud-init:master into cloud-init:master.

diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py
index 8f9c144..ac4a2a7 100644
--- a/cloudinit/sources/helpers/openstack.py
+++ b/cloudinit/sources/helpers/openstack.py
@@ -622,8 +622,8 @@ def convert_net_json(network_json=None, known_macs=None):
             curinfo.update({'mac': link['vlan_mac_address'],
                             'name': name})
         else:
-            raise ValueError(
-                'Unknown network_data link type: %s' % link['type'])
+            LOG.warning('Unknown network_data link type: %s' % link['type'])
+            continue
 
         config.append(cfg)
         link_id_info[curinfo['id']] = curinfo