starlingx
/
config
Code Issues Proposed changes

Merge "Handle config file without cluster network"

This commit is contained in:
Zuul 2019-01-17 20:19:12 +00:00 committed by Gerrit Code Review
parent cd502b9130 b3f8165d9a
commit b63ed49e15
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
controllerconfig/controllerconfig/controllerconfig/configassistant.py
View File

@ -3007,28 +3007,33 @@ class ConfigAssistant():
# Cluster network configuration # Cluster network configuration
if self.kubernetes: if self.kubernetes:
self.cluster_host_interface_name = config.get( if config.has_section('cCLUSTER'):
'cCLUSTER', 'CLUSTER_INTERFACE_NAME') self.cluster_host_interface_name = config.get(
self.cluster_host_interface = config.get( 'cCLUSTER', 'CLUSTER_INTERFACE_NAME')
'cCLUSTER', 'CLUSTER_INTERFACE') self.cluster_host_interface = config.get(
self.cluster_host_mtu = config.get( 'cCLUSTER', 'CLUSTER_INTERFACE')
'cCLUSTER', 'CLUSTER_MTU') self.cluster_host_mtu = config.get(
self.cluster_host_vlan = '' 'cCLUSTER', 'CLUSTER_MTU')
if config.has_option('cCLUSTER', 'CLUSTER_VLAN'): self.cluster_host_vlan = ''
cvalue = config.get('cCLUSTER', 'CLUSTER_VLAN') if config.has_option('cCLUSTER', 'CLUSTER_VLAN'):
if cvalue != 'NC': cvalue = config.get('cCLUSTER', 'CLUSTER_VLAN')
self.cluster_host_vlan = cvalue if cvalue != 'NC':
self.lag_cluster_host_interface = config.getboolean( self.cluster_host_vlan = cvalue
'cCLUSTER', 'LAG_CLUSTER_INTERFACE') self.lag_cluster_host_interface = config.getboolean(
if self.lag_cluster_host_interface: 'cCLUSTER', 'LAG_CLUSTER_INTERFACE')
self.lag_cluster_host_interface_member0 = config.get( if self.lag_cluster_host_interface:
'cCLUSTER', 'CLUSTER_BOND_MEMBER_0') self.lag_cluster_host_interface_member0 = config.get(
self.lag_cluster_host_interface_member1 = config.get( 'cCLUSTER', 'CLUSTER_BOND_MEMBER_0')
'cCLUSTER', 'CLUSTER_BOND_MEMBER_1') self.lag_cluster_host_interface_member1 = config.get(
self.lag_cluster_host_interface_policy = config.get( 'cCLUSTER', 'CLUSTER_BOND_MEMBER_1')
'cCLUSTER', 'CLUSTER_BOND_POLICY') self.lag_cluster_host_interface_policy = config.get(
self.cluster_host_subnet = IPNetwork(config.get( 'cCLUSTER', 'CLUSTER_BOND_POLICY')
'cCLUSTER', 'CLUSTER_SUBNET')) self.cluster_host_subnet = IPNetwork(config.get(
'cCLUSTER', 'CLUSTER_SUBNET'))
else:
self.cluster_host_interface_name = \
self.management_interface_name
self.cluster_host_interface = self.management_interface
self.cluster_host_interface_configured = True self.cluster_host_interface_configured = True
# External OAM network configuration # External OAM network configuration