starlingx
/
config
Code Issues Proposed changes

Reduce minimum mgmt ip range for subcloud 

For Distributed Cloud, reduce minimum mgmt ip range upon subcloud add
from 8 to 5.

Story: 2002869
Task: 22819

Change-Id: I05e8ddfbf4adfe723d75a4553905bf05ea107a07
Signed-off-by: Jack Ding <jack.ding@windriver.com>
This commit is contained in:
Kevin Smith 2018-06-20 10:08:54 -04:00 committed by Jack Ding
parent 9c17628f19
commit 17f1c84f7e
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configutilities/configutilities/configutilities/common/validator.py
View File

@ -346,9 +346,16 @@ class ConfigValidator(object):
# Management network configuration # Management network configuration
mgmt_prefix = NETWORK_PREFIX_NAMES[self.naming_type][MGMT_TYPE] mgmt_prefix = NETWORK_PREFIX_NAMES[self.naming_type][MGMT_TYPE]
self.mgmt_network = Network() self.mgmt_network = Network()
if self.config_type == SUBCLOUD_CONFIG:
min_addresses = 5
else:
min_addresses = 8
try: try:
self.mgmt_network.parse_config(self.conf, self.config_type, self.mgmt_network.parse_config(self.conf, self.config_type,
MGMT_TYPE, min_addresses=8, MGMT_TYPE,
min_addresses=min_addresses,
multicast_addresses=16, multicast_addresses=16,
naming_type=self.naming_type) naming_type=self.naming_type)
except ConfigFail: except ConfigFail:

2
controllerconfig/controllerconfig/controllerconfig/regionconfig.py
View File

@ -553,7 +553,7 @@ def configure_region(config_file, config_type=REGION_CONFIG):
# Bring up management interface to allow us to reach Region 1 # Bring up management interface to allow us to reach Region 1
print "Configuring management interface... ", print "Configuring management interface... ",
configure_management_interface(region_config) configure_management_interface(region_config, config_type=config_type)
print "DONE" print "DONE"
# Get token from keystone # Get token from keystone

8
controllerconfig/controllerconfig/controllerconfig/systemconfig.py
View File

@ -54,9 +54,15 @@ def configure_management_interface(region_config, config_type=REGION_CONFIG):
naming_type = HP_NAMES naming_type = HP_NAMES
else: else:
naming_type = DEFAULT_NAMES naming_type = DEFAULT_NAMES
if config_type == SUBCLOUD_CONFIG:
min_addresses = 5
else:
min_addresses = 8
try: try:
mgmt_network.parse_config(region_config, config_type, MGMT_TYPE, mgmt_network.parse_config(region_config, config_type, MGMT_TYPE,
min_addresses=8, naming_type=naming_type) min_addresses=min_addresses,
naming_type=naming_type)
except ConfigFail: except ConfigFail:
raise raise
except Exception as e: except Exception as e: