Allow mgmt and infra network on single interface

This update allows management and infrastructure interface
to share the same interface without VLAN.
Removed the restriction that enforce a VLAN to be used.

Story: 2003087
Task: 23171

Change-Id: Ic50fa0cd388c664f3277681b4d87b63aeb0c6447
Signed-off-by: Teresa Ho <teresa.ho@windriver.com>
This commit is contained in:
Teresa Ho
2018-09-17 13:08:37 -04:00
parent 3a5e7c6fd6
commit f8b82f2dff
3 changed files with 0 additions and 22 deletions

View File

@@ -606,10 +606,6 @@ class ConfigValidator(object):
self.configured_vlans.append(self.infra_network.vlan)
infrastructure_interface_name += '.' + (
str(self.infra_network.vlan))
elif self.infrastructure_interface == self.management_interface:
raise ConfigFail(
"VLAN required for %s_NETWORK since it uses the same "
"interface as another network" % infra_prefix)
mtu = self.infra_network.logical_interface.mtu
if not is_mtu_valid(mtu):