From e7c0133967ce5fc5ad4a3a1392976237673b8700 Mon Sep 17 00:00:00 2001 From: Teresa Ho Date: Fri, 8 Feb 2019 09:20:44 -0500 Subject: [PATCH] Fix cluster host network when mgmt is tagged When management interface is tagged on pxeboot, the cluster-host network should be assigned to the mgmt interface by default, not the pxeboot interface. This commit is to set the vlan id of the cluster-host interface to that of the management interface if the cluster-host interface is not specified in the configuration file. Closes-Bug: 1815053 Change-Id: Ia9b003af118df21eecba4d1b644c2738761e7553 Signed-off-by: Teresa Ho --- .../controllerconfig/controllerconfig/configassistant.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controllerconfig/controllerconfig/controllerconfig/configassistant.py b/controllerconfig/controllerconfig/controllerconfig/configassistant.py index 72b202ccc7..2915f6b783 100644 --- a/controllerconfig/controllerconfig/controllerconfig/configassistant.py +++ b/controllerconfig/controllerconfig/controllerconfig/configassistant.py @@ -2475,7 +2475,7 @@ class ConfigAssistant(): while True: user_input = input( - "Configure an cluster host VLAN [y/N]: ") + "Configure a cluster host VLAN [y/N]: ") if user_input.lower() == 'q': raise UserQuit elif user_input.lower() == 'y': @@ -3223,6 +3223,7 @@ class ConfigAssistant(): self.cluster_host_interface_name = \ self.management_interface_name self.cluster_host_interface = self.management_interface + self.cluster_host_vlan = self.management_vlan self.cluster_host_interface_configured = True # External OAM network configuration