Disallow infra network on Distributed Cloud
Disallow infra network provisioning on Distributed Cloud systemcontrollers. Story: 2002871 Task: 22823 Change-Id: I559c8a210d692bd2cda9ebc51064691775571db0 Signed-off-by: Jack Ding <jack.ding@windriver.com>
This commit is contained in:
parent
959b018784
commit
b13cf38786
|
@ -533,6 +533,15 @@ class ConfigValidator(object):
|
||||||
infra_prefix = NETWORK_PREFIX_NAMES[self.naming_type][INFRA_TYPE]
|
infra_prefix = NETWORK_PREFIX_NAMES[self.naming_type][INFRA_TYPE]
|
||||||
mgmt_prefix = NETWORK_PREFIX_NAMES[self.naming_type][MGMT_TYPE]
|
mgmt_prefix = NETWORK_PREFIX_NAMES[self.naming_type][MGMT_TYPE]
|
||||||
if self.conf.has_section(infra_prefix + '_NETWORK'):
|
if self.conf.has_section(infra_prefix + '_NETWORK'):
|
||||||
|
if (self.system_dc_role ==
|
||||||
|
DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER):
|
||||||
|
# Disallow infrastructure network on systemcontroller,
|
||||||
|
# as services located on infrastructure network will not
|
||||||
|
# be reachable by subclouds.
|
||||||
|
raise ConfigFail("%s network not "
|
||||||
|
"supported on Distributed Cloud "
|
||||||
|
"SystemController." % infra_prefix)
|
||||||
|
|
||||||
self.infra_network = Network()
|
self.infra_network = Network()
|
||||||
try:
|
try:
|
||||||
self.infra_network.parse_config(self.conf, self.config_type,
|
self.infra_network.parse_config(self.conf, self.config_type,
|
||||||
|
|
|
@ -2300,6 +2300,11 @@ class ConfigAssistant():
|
||||||
self.input_dc_selection()
|
self.input_dc_selection()
|
||||||
self.input_pxeboot_config()
|
self.input_pxeboot_config()
|
||||||
self.input_management_config()
|
self.input_management_config()
|
||||||
|
if self.system_dc_role != \
|
||||||
|
sysinv_constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER:
|
||||||
|
# Disallow infrastructure network on systemcontroller,
|
||||||
|
# as services located on infrastructure network will not
|
||||||
|
# be reachable by subclouds.
|
||||||
self.input_infrastructure_config()
|
self.input_infrastructure_config()
|
||||||
self.input_external_oam_config()
|
self.input_external_oam_config()
|
||||||
self.input_authentication_config()
|
self.input_authentication_config()
|
||||||
|
|
Loading…
Reference in New Issue