diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-06-28 18:58:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-28 18:58:11 +0000 |
| commit | 2840a7db67fdaf58567c195557c6fb8ee38f73bd (patch) | |
| tree | 1beb8f677649ca6d1bf670ab4eca175fcdd5b60a /lib/python/apex/network_settings.py | |
| parent | c5ea99b97d53ddb8451be21ffed5118125457cca (diff) | |
| parent | 890ed0bcb03b61c5e5da596f89771d6196cd4231 (diff) | |
Merge changes from topics 'fix_dpdk', 'vlan_support'
* changes:
Fixes IP failure during os-collect-config ping check
Adding VLAN support
Diffstat (limited to 'lib/python/apex/network_settings.py')
| -rw-r--r-- | lib/python/apex/network_settings.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/python/apex/network_settings.py b/lib/python/apex/network_settings.py index 9df8a1de..475082df 100644 --- a/lib/python/apex/network_settings.py +++ b/lib/python/apex/network_settings.py @@ -84,6 +84,11 @@ class NetworkSettings: given NIC in the system. The resulting config in settings object will be an ipaddress.network object, replacing the NIC name. """ + # if vlan not defined then default it to native + if network is not constants.ADMIN_NETWORK: + if 'vlan' not in self.settings_obj[network]: + self.settings_obj[network]['vlan'] = 'native' + cidr = self.settings_obj[network].get('cidr') nic_name = self.settings_obj[network].get('bridged_interface') |