Merge "removing link capacity configuration during controller config"
This commit is contained in:
commit
a703e9d4c5
|
@ -11,10 +11,9 @@ from common.configobjects import (Network, DEFAULT_CONFIG, REGION_CONFIG,
|
|||
DEFAULT_NAMES, HP_NAMES, SUBCLOUD_CONFIG,
|
||||
MGMT_TYPE, INFRA_TYPE, OAM_TYPE,
|
||||
NETWORK_PREFIX_NAMES, HOST_XML_ATTRIBUTES,
|
||||
LINK_SPEED_1G, LINK_SPEED_10G,
|
||||
DEFAULT_DOMAIN_NAME)
|
||||
from common.exceptions import ConfigError, ConfigFail, ValidateFail
|
||||
from common.utils import is_valid_vlan, is_mtu_valid, is_speed_valid, \
|
||||
from common.utils import is_valid_vlan, is_mtu_valid, \
|
||||
validate_network_str, validate_address_str, validate_address, \
|
||||
ip_version_to_string, lag_mode_to_str, \
|
||||
validate_openstack_password, extract_openstack_password_rules_from_file
|
||||
|
|
|
@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0
|
|||
|
||||
from netaddr import IPRange
|
||||
from exceptions import ConfigFail, ValidateFail
|
||||
from utils import is_mtu_valid, is_speed_valid, is_valid_vlan, \
|
||||
from utils import is_mtu_valid, is_valid_vlan, \
|
||||
validate_network_str, validate_address_str
|
||||
|
||||
DEFAULT_CONFIG = 0
|
||||
|
@ -21,10 +21,6 @@ NETWORK_PREFIX_NAMES = [
|
|||
('MGMT', 'INFRA', 'OAM'),
|
||||
('CLM', 'BLS', 'CAN')
|
||||
]
|
||||
LINK_SPEED_1G = 1000
|
||||
LINK_SPEED_10G = 10000
|
||||
LINK_SPEED_25G = 25000
|
||||
VALID_LINK_SPEED = [LINK_SPEED_1G, LINK_SPEED_10G, LINK_SPEED_25G]
|
||||
|
||||
# Additions to this list must be reflected in the hostfile
|
||||
# generator tool (config->configutilities->hostfiletool.py)
|
||||
|
@ -49,7 +45,6 @@ class LogicalInterface(object):
|
|||
def __init__(self):
|
||||
self.name = None
|
||||
self.mtu = None
|
||||
self.link_capacity = None
|
||||
self.lag_interface = False
|
||||
self.lag_mode = None
|
||||
self.ports = None
|
||||
|
@ -67,19 +62,6 @@ class LogicalInterface(object):
|
|||
raise ConfigFail("Invalid MTU value for %s. "
|
||||
"Valid values: 576 - 9216" % logical_interface)
|
||||
|
||||
# Parse/validate the link_capacity
|
||||
if system_config.has_option(logical_interface,
|
||||
'INTERFACE_LINK_CAPACITY'):
|
||||
self.link_capacity = \
|
||||
system_config.getint(logical_interface,
|
||||
'INTERFACE_LINK_CAPACITY')
|
||||
# link_capacity is optional
|
||||
if self.link_capacity:
|
||||
if not is_speed_valid(self.link_capacity,
|
||||
valid_speeds=VALID_LINK_SPEED):
|
||||
raise ConfigFail(
|
||||
"Invalid link-capacity value for %s." % logical_interface)
|
||||
|
||||
# Parse the ports
|
||||
self.ports = filter(None, [x.strip() for x in
|
||||
system_config.get(logical_interface,
|
||||
|
|
|
@ -74,17 +74,6 @@ def is_mtu_valid(mtu):
|
|||
return False
|
||||
|
||||
|
||||
def is_speed_valid(speed, valid_speeds=None):
|
||||
"""Determine whether speed is valid."""
|
||||
try:
|
||||
if valid_speeds is not None and int(speed) not in valid_speeds:
|
||||
return False
|
||||
else:
|
||||
return True
|
||||
except (ValueError, TypeError):
|
||||
return False
|
||||
|
||||
|
||||
def is_valid_hostname(hostname):
|
||||
"""Determine whether a hostname is valid as per RFC 1123."""
|
||||
|
||||
|
|
|
@ -5,11 +5,11 @@ SPDX-License-Identifier: Apache-2.0
|
|||
|
||||
"""
|
||||
from configobjects import DEFAULT_NAMES, NETWORK_PREFIX_NAMES, OAM_TYPE, \
|
||||
MGMT_TYPE, Network, REGION_CONFIG, VALID_LINK_SPEED, INFRA_TYPE, \
|
||||
MGMT_TYPE, Network, REGION_CONFIG, INFRA_TYPE, \
|
||||
DEFAULT_DOMAIN_NAME, HP_NAMES, SUBCLOUD_CONFIG
|
||||
from netaddr import IPRange
|
||||
from utils import lag_mode_to_str, validate_network_str, \
|
||||
check_network_overlap, is_mtu_valid, is_speed_valid, get_service, \
|
||||
check_network_overlap, is_mtu_valid, get_service, \
|
||||
get_optional, validate_address_str
|
||||
|
||||
from exceptions import ConfigFail, ValidateFail
|
||||
|
@ -565,22 +565,10 @@ class ConfigValidator(object):
|
|||
"Valid values: 576 - 9216"
|
||||
% (mtu, self.mgmt_network.logical_interface.name))
|
||||
|
||||
# link_capacity is optional
|
||||
speed = self.mgmt_network.logical_interface.link_capacity
|
||||
if speed:
|
||||
if not is_speed_valid(speed,
|
||||
valid_speeds=VALID_LINK_SPEED):
|
||||
raise ConfigFail(
|
||||
"Invalid link-capacity value %s for %s."
|
||||
% (speed, self.mgmt_network.logical_interface.name))
|
||||
|
||||
if self.cgcs_conf is not None:
|
||||
self.cgcs_conf.add_section('cMGMT')
|
||||
self.cgcs_conf.set('cMGMT', 'MANAGEMENT_MTU',
|
||||
self.mgmt_network.logical_interface.mtu)
|
||||
self.cgcs_conf.set(
|
||||
'cMGMT', 'MANAGEMENT_LINK_CAPACITY',
|
||||
self.mgmt_network.logical_interface.link_capacity)
|
||||
self.cgcs_conf.set('cMGMT', 'MANAGEMENT_SUBNET',
|
||||
self.mgmt_network.cidr)
|
||||
if self.mgmt_network.logical_interface.lag_interface:
|
||||
|
@ -729,22 +717,10 @@ class ConfigValidator(object):
|
|||
"Valid values: 576 - 9216"
|
||||
% (mtu, self.infra_network.logical_interface.name))
|
||||
|
||||
# link_capacity is optional
|
||||
speed = self.infra_network.logical_interface.link_capacity
|
||||
if speed:
|
||||
if not is_speed_valid(speed,
|
||||
valid_speeds=VALID_LINK_SPEED):
|
||||
raise ConfigFail(
|
||||
"Invalid link-capacity value %s for %s."
|
||||
% (speed, self.infra_network.logical_interface.name))
|
||||
|
||||
if self.cgcs_conf is not None:
|
||||
self.cgcs_conf.add_section('cINFRA')
|
||||
self.cgcs_conf.set('cINFRA', 'INFRASTRUCTURE_MTU',
|
||||
self.infra_network.logical_interface.mtu)
|
||||
self.cgcs_conf.set(
|
||||
'cINFRA', 'INFRASTRUCTURE_LINK_CAPACITY',
|
||||
self.infra_network.logical_interface.link_capacity)
|
||||
self.cgcs_conf.set('cINFRA', 'INFRASTRUCTURE_SUBNET',
|
||||
self.infra_network.cidr)
|
||||
|
||||
|
|
|
@ -21,10 +21,6 @@ from common.validator import ConfigValidator, TiS_VERSION
|
|||
PADDING = 5
|
||||
CONFIG_TYPE = DEFAULT_CONFIG
|
||||
|
||||
LINK_SPEED_1G = '1000'
|
||||
LINK_SPEED_10G = '10000'
|
||||
LINK_SPEED_25G = '25000'
|
||||
|
||||
# Config parser to hold current configuration
|
||||
filename = None
|
||||
filedir = None
|
||||
|
@ -918,9 +914,6 @@ class MGMTPage(ConfigPage):
|
|||
('Active-backup policy', '1'),
|
||||
('802.3ad (LACP) policy', '4'),
|
||||
])
|
||||
self.mgmt_speed_choices = [LINK_SPEED_1G,
|
||||
LINK_SPEED_10G,
|
||||
LINK_SPEED_25G]
|
||||
self.section = "MGMT_NETWORK"
|
||||
if get_opt('SYSTEM', 'SYSTEM_MODE') != 'simplex':
|
||||
self.validator_methods = ["validate_pxeboot", "validate_mgmt"]
|
||||
|
@ -978,13 +971,6 @@ class MGMTPage(ConfigPage):
|
|||
initial="1500",
|
||||
transient=True
|
||||
)
|
||||
self.fields['INTERFACE_LINK_CAPACITY'] = Field(
|
||||
text="Management interface link capacity Mbps",
|
||||
type=TYPES.choice,
|
||||
choices=self.mgmt_speed_choices,
|
||||
initial=self.mgmt_speed_choices[0],
|
||||
transient=True
|
||||
)
|
||||
if config.has_option('PXEBOOT_NETWORK', 'PXEBOOT_CIDR') or \
|
||||
config.has_option('REGION2_PXEBOOT_NETWORK',
|
||||
'PXEBOOT_CIDR'):
|
||||
|
@ -1067,8 +1053,6 @@ class MGMTPage(ConfigPage):
|
|||
lag=self.fields['LAG_INTERFACE'].get_value(),
|
||||
mode=self.lag_choices.get(self.fields['LAG_MODE'].get_value()),
|
||||
mtu=self.fields['INTERFACE_MTU'].get_value(),
|
||||
link_capacity=self.fields[
|
||||
'INTERFACE_LINK_CAPACITY'].get_value(),
|
||||
ports=ports
|
||||
)
|
||||
config.set(self.section, 'LOGICAL_INTERFACE', li)
|
||||
|
@ -1085,9 +1069,6 @@ class INFRAPage(ConfigPage):
|
|||
('Balanced XOR policy', '2'),
|
||||
('802.3ad (LACP) policy', '4'),
|
||||
])
|
||||
self.infra_speed_choices = [LINK_SPEED_1G,
|
||||
LINK_SPEED_10G,
|
||||
LINK_SPEED_25G]
|
||||
|
||||
self.section = "INFRA_NETWORK"
|
||||
self.validator_methods = ["validate_storage",
|
||||
|
@ -1150,13 +1131,6 @@ class INFRAPage(ConfigPage):
|
|||
initial="1500",
|
||||
transient=True
|
||||
)
|
||||
self.fields['INTERFACE_LINK_CAPACITY'] = Field(
|
||||
text="Infrastructure interface link capacity Mbps",
|
||||
type=TYPES.choice,
|
||||
choices=self.infra_speed_choices,
|
||||
initial=self.infra_speed_choices[-1],
|
||||
transient=True
|
||||
)
|
||||
|
||||
# VLAN
|
||||
self.fields['use_vlan'] = Field(
|
||||
|
@ -1219,7 +1193,6 @@ class INFRAPage(ConfigPage):
|
|||
lag=self.fields['LAG_INTERFACE'].get_value(),
|
||||
mode=self.lag_choices.get(self.fields['LAG_MODE'].get_value()),
|
||||
mtu=self.fields['INTERFACE_MTU'].get_value(),
|
||||
link_capacity=self.fields['INTERFACE_LINK_CAPACITY'].get_value(),
|
||||
ports=ports
|
||||
)
|
||||
config.set(self.section, 'LOGICAL_INTERFACE', li)
|
||||
|
@ -1458,7 +1431,7 @@ def clean_lis():
|
|||
config.remove_section(sec)
|
||||
|
||||
|
||||
def create_li(lag='N', mode=None, mtu=1500, link_capacity=None, ports=None):
|
||||
def create_li(lag='N', mode=None, mtu=1500, ports=None):
|
||||
# todo more graceful matching to an existing LI
|
||||
for number in range(1, len(config.sections())):
|
||||
if config.has_section("LOGICAL_INTERFACE_" + str(number)):
|
||||
|
@ -1477,8 +1450,6 @@ def create_li(lag='N', mode=None, mtu=1500, link_capacity=None, ports=None):
|
|||
if mode:
|
||||
config.set(name, 'LAG_MODE', mode)
|
||||
config.set(name, 'INTERFACE_MTU', mtu)
|
||||
if link_capacity:
|
||||
config.set(name, 'INTERFACE_LINK_CAPACITY', link_capacity)
|
||||
return name
|
||||
|
||||
# Get unused LI number
|
||||
|
@ -1493,8 +1464,6 @@ def create_li(lag='N', mode=None, mtu=1500, link_capacity=None, ports=None):
|
|||
if mode:
|
||||
config.set(name, 'LAG_MODE', mode)
|
||||
config.set(name, 'INTERFACE_MTU', mtu)
|
||||
if link_capacity:
|
||||
config.set(name, 'INTERFACE_LINK_CAPACITY', link_capacity)
|
||||
config.set(name, 'INTERFACE_PORTS', ports)
|
||||
return name
|
||||
|
||||
|
|
|
@ -60,13 +60,6 @@ DEFAULT_VIRTUAL_BACKUP_STOR_SIZE = \
|
|||
DEFAULT_EXTENSION_STOR_SIZE = \
|
||||
sysinv_constants.DEFAULT_EXTENSION_STOR_SIZE
|
||||
|
||||
VALID_LINK_SPEED_MGMT = [sysinv_constants.LINK_SPEED_1G,
|
||||
sysinv_constants.LINK_SPEED_10G,
|
||||
sysinv_constants.LINK_SPEED_25G]
|
||||
VALID_LINK_SPEED_INFRA = [sysinv_constants.LINK_SPEED_1G,
|
||||
sysinv_constants.LINK_SPEED_10G,
|
||||
sysinv_constants.LINK_SPEED_25G]
|
||||
|
||||
SYSTEM_CONFIG_TIMEOUT = 300
|
||||
SERVICE_ENABLE_TIMEOUT = 180
|
||||
MINIMUM_ROOT_DISK_SIZE = 500
|
||||
|
|
|
@ -21,7 +21,7 @@ import time
|
|||
|
||||
import pyudev
|
||||
from configutilities import ConfigFail, ValidateFail
|
||||
from configutilities import is_valid_vlan, is_mtu_valid, is_speed_valid, \
|
||||
from configutilities import is_valid_vlan, is_mtu_valid, \
|
||||
validate_network_str, validate_address_str, validate_address, \
|
||||
ip_version_to_string, validate_openstack_password
|
||||
from configutilities import DEFAULT_DOMAIN_NAME
|
||||
|
@ -363,7 +363,6 @@ class ConfigAssistant():
|
|||
self.management_interface = self.net_devices[1]
|
||||
self.management_vlan = ""
|
||||
self.management_mtu = constants.LINK_MTU_DEFAULT
|
||||
self.management_link_capacity = sysinv_constants.LINK_SPEED_10G
|
||||
self.next_lag_index = 0
|
||||
self.lag_management_interface = False
|
||||
self.lag_management_interface_member0 = self.net_devices[1]
|
||||
|
@ -396,7 +395,6 @@ class ConfigAssistant():
|
|||
self.infrastructure_interface = ""
|
||||
self.infrastructure_vlan = ""
|
||||
self.infrastructure_mtu = constants.LINK_MTU_DEFAULT
|
||||
self.infrastructure_link_capacity = sysinv_constants.LINK_SPEED_10G
|
||||
self.lag_infrastructure_interface = False
|
||||
self.lag_infrastructure_interface_member0 = ""
|
||||
self.lag_infrastructure_interface_member1 = ""
|
||||
|
@ -1041,23 +1039,6 @@ class ConfigAssistant():
|
|||
print("MTU is invalid/unsupported")
|
||||
continue
|
||||
|
||||
while True:
|
||||
user_input = input(
|
||||
"Management interface link capacity Mbps [" +
|
||||
str(self.management_link_capacity) + "]: ")
|
||||
if user_input.lower() == 'q':
|
||||
raise UserQuit
|
||||
elif user_input == '':
|
||||
break
|
||||
elif is_speed_valid(user_input,
|
||||
valid_speeds=constants.VALID_LINK_SPEED_MGMT):
|
||||
self.management_link_capacity = user_input
|
||||
break
|
||||
else:
|
||||
print("Invalid choice, select from: %s"
|
||||
% (', '.join(map(str, constants.VALID_LINK_SPEED_MGMT))))
|
||||
continue
|
||||
|
||||
while True:
|
||||
if not self.lag_management_interface:
|
||||
break
|
||||
|
@ -1648,23 +1629,6 @@ class ConfigAssistant():
|
|||
print("MTU is invalid/unsupported")
|
||||
continue
|
||||
|
||||
while True:
|
||||
user_input = input(
|
||||
"Infrastructure interface link capacity Mbps [" +
|
||||
str(self.infrastructure_link_capacity) + "]: ")
|
||||
if user_input.lower() == 'q':
|
||||
raise UserQuit
|
||||
elif user_input == '':
|
||||
break
|
||||
elif is_speed_valid(user_input,
|
||||
valid_speeds=constants.VALID_LINK_SPEED_INFRA):
|
||||
self.infrastructure_link_capacity = user_input
|
||||
break
|
||||
else:
|
||||
print("Invalid choice, select from: %s" %
|
||||
(', '.join(map(str, constants.VALID_LINK_SPEED_INFRA))))
|
||||
continue
|
||||
|
||||
while True:
|
||||
if not self.lag_infrastructure_interface:
|
||||
break
|
||||
|
@ -2572,12 +2536,6 @@ class ConfigAssistant():
|
|||
'cMGMT', 'MANAGEMENT_INTERFACE')
|
||||
self.management_mtu = config.get(
|
||||
'cMGMT', 'MANAGEMENT_MTU')
|
||||
cvalue = config.get('cMGMT', 'MANAGEMENT_LINK_CAPACITY')
|
||||
if cvalue is not None and cvalue != 'NC':
|
||||
try:
|
||||
self.management_link_capacity = int(cvalue)
|
||||
except (ValueError, TypeError):
|
||||
pass
|
||||
self.management_subnet = IPNetwork(config.get(
|
||||
'cMGMT', 'MANAGEMENT_SUBNET'))
|
||||
if config.has_option('cMGMT', 'MANAGEMENT_GATEWAY_ADDRESS'):
|
||||
|
@ -2659,12 +2617,6 @@ class ConfigAssistant():
|
|||
if self.infrastructure_interface:
|
||||
self.infrastructure_mtu = config.get(
|
||||
'cINFRA', 'INFRASTRUCTURE_MTU')
|
||||
cvalue = config.get('cINFRA', 'INFRASTRUCTURE_LINK_CAPACITY')
|
||||
if cvalue is not None and cvalue != 'NC':
|
||||
try:
|
||||
self.infrastructure_link_capacity = int(cvalue)
|
||||
except (ValueError, TypeError):
|
||||
pass
|
||||
self.infrastructure_vlan = ''
|
||||
if config.has_option('cINFRA',
|
||||
'INFRASTRUCTURE_INTERFACE_NAME'):
|
||||
|
@ -3063,8 +3015,6 @@ class ConfigAssistant():
|
|||
if self.management_vlan:
|
||||
print("Management vlan: " + self.management_vlan)
|
||||
print("Management interface MTU: " + self.management_mtu)
|
||||
print("Management interface link capacity Mbps: " +
|
||||
str(self.management_link_capacity))
|
||||
if self.lag_management_interface:
|
||||
print("Management ae member 0: " +
|
||||
self.lag_management_interface_member0)
|
||||
|
@ -3111,8 +3061,6 @@ class ConfigAssistant():
|
|||
if self.infrastructure_vlan:
|
||||
print("Infrastructure vlan: " + self.infrastructure_vlan)
|
||||
print("Infrastructure interface MTU: " + self.infrastructure_mtu)
|
||||
print("Infrastructure interface link capacity Mbps: " +
|
||||
str(self.infrastructure_link_capacity))
|
||||
if self.lag_infrastructure_interface:
|
||||
print("Infrastructure ae member 0: " +
|
||||
self.lag_infrastructure_interface_member0)
|
||||
|
@ -3275,8 +3223,6 @@ class ConfigAssistant():
|
|||
if self.separate_pxeboot_network:
|
||||
f.write("MANAGEMENT_VLAN=" + self.management_vlan + "\n")
|
||||
f.write("MANAGEMENT_MTU=" + self.management_mtu + "\n")
|
||||
f.write("MANAGEMENT_LINK_CAPACITY=" +
|
||||
str(self.management_link_capacity) + "\n")
|
||||
f.write("MANAGEMENT_SUBNET=" +
|
||||
str(self.management_subnet.cidr) + "\n")
|
||||
if self.management_gateway_address:
|
||||
|
@ -3333,8 +3279,6 @@ class ConfigAssistant():
|
|||
+ self.infrastructure_vlan + "\n")
|
||||
f.write("INFRASTRUCTURE_MTU="
|
||||
+ self.infrastructure_mtu + "\n")
|
||||
f.write("INFRASTRUCTURE_LINK_CAPACITY="
|
||||
+ str(self.infrastructure_link_capacity) + "\n")
|
||||
f.write("INFRASTRUCTURE_SUBNET=" +
|
||||
str(self.infrastructure_subnet.cidr) + "\n")
|
||||
if self.lag_infrastructure_interface:
|
||||
|
@ -3370,7 +3314,6 @@ class ConfigAssistant():
|
|||
f.write("INFRASTRUCTURE_INTERFACE=NC\n")
|
||||
f.write("INFRASTRUCTURE_VLAN=NC\n")
|
||||
f.write("INFRASTRUCTURE_MTU=NC\n")
|
||||
f.write("INFRASTRUCTURE_LINK_CAPACITY=NC\n")
|
||||
f.write("INFRASTRUCTURE_SUBNET=NC\n")
|
||||
f.write("LAG_INFRASTRUCTURE_INTERFACE=no\n")
|
||||
f.write("INFRASTRUCTURE_BOND_MEMBER_0=NC\n")
|
||||
|
@ -3616,18 +3559,6 @@ class ConfigAssistant():
|
|||
"grub.cfg symlink")
|
||||
raise ConfigFail("Failed to persist config files")
|
||||
|
||||
def verify_link_capacity_config(self):
|
||||
""" Verify the configuration of the management link capacity"""
|
||||
if not self.infrastructure_interface_configured and \
|
||||
int(self.management_link_capacity) < \
|
||||
sysinv_constants.LINK_SPEED_10G:
|
||||
print('')
|
||||
print(textwrap.fill(
|
||||
"Warning: The infrastructure network was not configured, "
|
||||
"and the management interface link capacity is less than "
|
||||
"10000 Mbps. This is not a supported configuration and "
|
||||
"will result in unacceptable DRBD sync times.", 80))
|
||||
|
||||
def verify_branding(self):
|
||||
""" Verify the constraints for custom branding procedure """
|
||||
found = False
|
||||
|
@ -4747,9 +4678,6 @@ class ConfigAssistant():
|
|||
if display_config:
|
||||
self.display_config()
|
||||
|
||||
# Verify the management link capacity
|
||||
self.verify_link_capacity_config()
|
||||
|
||||
# Validate Openstack passwords loaded in via config
|
||||
if configfile:
|
||||
self.process_validation_passwords()
|
||||
|
|
|
@ -11,7 +11,6 @@ PXECONTROLLER_FLOATING_HOSTNAME = pxecontroller
|
|||
|
||||
[cMGMT]
|
||||
MANAGEMENT_MTU = 1500
|
||||
MANAGEMENT_LINK_CAPACITY = None
|
||||
MANAGEMENT_SUBNET = 192.168.204.0/24
|
||||
LAG_MANAGEMENT_INTERFACE = no
|
||||
MANAGEMENT_INTERFACE = eth0
|
||||
|
@ -31,7 +30,6 @@ MANAGEMENT_MULTICAST_SUBNET = 239.1.1.0/28
|
|||
|
||||
[cINFRA]
|
||||
INFRASTRUCTURE_MTU = 1500
|
||||
INFRASTRUCTURE_LINK_CAPACITY = None
|
||||
INFRASTRUCTURE_SUBNET = 192.168.205.0/24
|
||||
LAG_INFRASTRUCTURE_INTERFACE = no
|
||||
INFRASTRUCTURE_INTERFACE = eth2
|
||||
|
|
|
@ -11,7 +11,6 @@ PXECONTROLLER_FLOATING_HOSTNAME = pxecontroller
|
|||
|
||||
[cMGMT]
|
||||
MANAGEMENT_MTU = 1500
|
||||
MANAGEMENT_LINK_CAPACITY = None
|
||||
MANAGEMENT_SUBNET = 192.168.204.0/24
|
||||
LAG_MANAGEMENT_INTERFACE = no
|
||||
MANAGEMENT_INTERFACE = eth0
|
||||
|
@ -31,7 +30,6 @@ MANAGEMENT_MULTICAST_SUBNET = 239.1.1.0/28
|
|||
|
||||
[cINFRA]
|
||||
INFRASTRUCTURE_MTU = 1500
|
||||
INFRASTRUCTURE_LINK_CAPACITY = None
|
||||
INFRASTRUCTURE_SUBNET = 192.168.205.0/24
|
||||
LAG_INFRASTRUCTURE_INTERFACE = no
|
||||
INFRASTRUCTURE_INTERFACE = eth2
|
||||
|
|
|
@ -12,7 +12,6 @@ PXECONTROLLER_FLOATING_HOSTNAME=pxecontroller
|
|||
MANAGEMENT_INTERFACE_NAME=eth1
|
||||
MANAGEMENT_INTERFACE=eth1
|
||||
MANAGEMENT_MTU=1500
|
||||
MANAGEMENT_LINK_CAPACITY=1000
|
||||
MANAGEMENT_SUBNET=192.168.204.0/24
|
||||
LAG_MANAGEMENT_INTERFACE=no
|
||||
CONTROLLER_FLOATING_ADDRESS=192.168.204.2
|
||||
|
@ -31,7 +30,6 @@ INFRASTRUCTURE_INTERFACE_NAME=eth2
|
|||
INFRASTRUCTURE_INTERFACE=eth2
|
||||
INFRASTRUCTURE_VLAN=
|
||||
INFRASTRUCTURE_MTU=1500
|
||||
INFRASTRUCTURE_LINK_CAPACITY=1000
|
||||
INFRASTRUCTURE_SUBNET=192.168.205.0/24
|
||||
LAG_INFRASTRUCTURE_INTERFACE=no
|
||||
CONTROLLER_0_INFRASTRUCTURE_ADDRESS=192.168.205.3
|
||||
|
|
|
@ -12,7 +12,6 @@ PXECONTROLLER_FLOATING_HOSTNAME=pxecontroller
|
|||
MANAGEMENT_INTERFACE_NAME=eth1
|
||||
MANAGEMENT_INTERFACE=eth1
|
||||
MANAGEMENT_MTU=1500
|
||||
MANAGEMENT_LINK_CAPACITY=1000
|
||||
MANAGEMENT_SUBNET=192.168.204.0/24
|
||||
LAG_MANAGEMENT_INTERFACE=no
|
||||
CONTROLLER_FLOATING_ADDRESS=192.168.204.2
|
||||
|
@ -32,7 +31,6 @@ INFRASTRUCTURE_INTERFACE_NAME=NC
|
|||
INFRASTRUCTURE_INTERFACE=NC
|
||||
INFRASTRUCTURE_VLAN=NC
|
||||
INFRASTRUCTURE_MTU=NC
|
||||
INFRASTRUCTURE_LINK_CAPACITY=NC
|
||||
INFRASTRUCTURE_SUBNET=NC
|
||||
LAG_INFRASTRUCTURE_INTERFACE=no
|
||||
INFRASTRUCTURE_BOND_MEMBER_0=NC
|
||||
|
|
|
@ -12,7 +12,6 @@ PXECONTROLLER_FLOATING_HOSTNAME=pxecontroller
|
|||
MANAGEMENT_INTERFACE_NAME=eth1
|
||||
MANAGEMENT_INTERFACE=eth1
|
||||
MANAGEMENT_MTU=1500
|
||||
MANAGEMENT_LINK_CAPACITY=1000
|
||||
MANAGEMENT_SUBNET=1234::/64
|
||||
LAG_MANAGEMENT_INTERFACE=no
|
||||
CONTROLLER_FLOATING_ADDRESS=1234::2
|
||||
|
@ -32,7 +31,6 @@ INFRASTRUCTURE_INTERFACE_NAME=NC
|
|||
INFRASTRUCTURE_INTERFACE=NC
|
||||
INFRASTRUCTURE_VLAN=NC
|
||||
INFRASTRUCTURE_MTU=NC
|
||||
INFRASTRUCTURE_LINK_CAPACITY=NC
|
||||
INFRASTRUCTURE_SUBNET=NC
|
||||
LAG_INFRASTRUCTURE_INTERFACE=no
|
||||
INFRASTRUCTURE_BOND_MEMBER_0=NC
|
||||
|
|
|
@ -12,7 +12,6 @@ PXECONTROLLER_FLOATING_HOSTNAME=pxecontroller
|
|||
MANAGEMENT_INTERFACE_NAME=eth1
|
||||
MANAGEMENT_INTERFACE=eth1
|
||||
MANAGEMENT_MTU=1500
|
||||
MANAGEMENT_LINK_CAPACITY=1000
|
||||
MANAGEMENT_SUBNET=192.168.204.0/24
|
||||
LAG_MANAGEMENT_INTERFACE=no
|
||||
CONTROLLER_FLOATING_ADDRESS=192.168.204.102
|
||||
|
@ -34,7 +33,6 @@ INFRASTRUCTURE_INTERFACE_NAME=NC
|
|||
INFRASTRUCTURE_INTERFACE=NC
|
||||
INFRASTRUCTURE_VLAN=NC
|
||||
INFRASTRUCTURE_MTU=NC
|
||||
INFRASTRUCTURE_LINK_CAPACITY=NC
|
||||
INFRASTRUCTURE_SUBNET=NC
|
||||
LAG_INFRASTRUCTURE_INTERFACE=no
|
||||
INFRASTRUCTURE_BOND_MEMBER_0=NC
|
||||
|
|
|
@ -12,7 +12,6 @@ PXECONTROLLER_FLOATING_HOSTNAME=pxecontroller
|
|||
MANAGEMENT_INTERFACE_NAME=eth1
|
||||
MANAGEMENT_INTERFACE=eth1
|
||||
MANAGEMENT_MTU=1500
|
||||
MANAGEMENT_LINK_CAPACITY=1000
|
||||
MANAGEMENT_SUBNET=192.168.204.0/24
|
||||
LAG_MANAGEMENT_INTERFACE=no
|
||||
CONTROLLER_FLOATING_ADDRESS=192.168.204.102
|
||||
|
@ -34,7 +33,6 @@ INFRASTRUCTURE_INTERFACE_NAME=NC
|
|||
INFRASTRUCTURE_INTERFACE=NC
|
||||
INFRASTRUCTURE_VLAN=NC
|
||||
INFRASTRUCTURE_MTU=NC
|
||||
INFRASTRUCTURE_LINK_CAPACITY=NC
|
||||
INFRASTRUCTURE_SUBNET=NC
|
||||
LAG_INFRASTRUCTURE_INTERFACE=no
|
||||
INFRASTRUCTURE_BOND_MEMBER_0=NC
|
||||
|
|
|
@ -11,14 +11,12 @@ TIMEZONE=UTC
|
|||
; 4) 802.3ad (LACP) policy
|
||||
; Interface for pxebooting can only be LACP
|
||||
; INTERFACE_MTU <mtu size>
|
||||
; INTERFACE_LINK_CAPACITY <Mbps>
|
||||
; INTERFACE_PORTS <comma separated list of ethernet interfaces>
|
||||
|
||||
[LOGICAL_INTERFACE_1]
|
||||
LAG_INTERFACE=Y
|
||||
LAG_MODE=4
|
||||
INTERFACE_MTU=1500
|
||||
INTERFACE_LINK_CAPACITY=1000
|
||||
INTERFACE_PORTS=eth1,eth2
|
||||
|
||||
[CLM_NETWORK]
|
||||
|
|
|
@ -11,7 +11,6 @@ PXECONTROLLER_FLOATING_HOSTNAME = pxecontroller
|
|||
|
||||
[cMGMT]
|
||||
MANAGEMENT_MTU = 1500
|
||||
MANAGEMENT_LINK_CAPACITY = 1000
|
||||
MANAGEMENT_SUBNET = 192.168.204.0/24
|
||||
LAG_MANAGEMENT_INTERFACE = yes
|
||||
MANAGEMENT_BOND_MEMBER_0 = eth1
|
||||
|
@ -35,7 +34,6 @@ MANAGEMENT_MULTICAST_SUBNET = 239.1.1.0/28
|
|||
|
||||
[cINFRA]
|
||||
INFRASTRUCTURE_MTU = 1500
|
||||
INFRASTRUCTURE_LINK_CAPACITY = 1000
|
||||
INFRASTRUCTURE_SUBNET = 192.168.205.0/24
|
||||
LAG_INFRASTRUCTURE_INTERFACE = no
|
||||
INFRASTRUCTURE_INTERFACE = bond0
|
||||
|
|
|
@ -10,21 +10,18 @@ SYSTEM_MODE = duplex
|
|||
; 4) 802.3ad (LACP) policy
|
||||
; Interface for pxebooting can only be LACP
|
||||
; INTERFACE_MTU <mtu size>
|
||||
; INTERFACE_LINK_CAPACITY <Mbps>
|
||||
; INTERFACE_PORTS <comma separated list of ethernet interfaces>
|
||||
|
||||
[LOGICAL_INTERFACE_1]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
INTERFACE_LINK_CAPACITY=1000
|
||||
INTERFACE_PORTS=eth1
|
||||
|
||||
[LOGICAL_INTERFACE_2]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
;INTERFACE_LINK_CAPACITY=
|
||||
INTERFACE_PORTS=eth0
|
||||
|
||||
[CLM_NETWORK]
|
||||
|
|
|
@ -7,7 +7,6 @@ PXECONTROLLER_FLOATING_HOSTNAME = pxecontroller
|
|||
|
||||
[cMGMT]
|
||||
MANAGEMENT_MTU = 1500
|
||||
MANAGEMENT_LINK_CAPACITY = 1000
|
||||
MANAGEMENT_SUBNET = 192.168.204.0/24
|
||||
LAG_MANAGEMENT_INTERFACE = no
|
||||
MANAGEMENT_INTERFACE = eth1
|
||||
|
|
|
@ -10,21 +10,18 @@ SYSTEM_MODE = duplex
|
|||
; 4) 802.3ad (LACP) policy
|
||||
; Interface for pxebooting can only be LACP
|
||||
; INTERFACE_MTU <mtu size>
|
||||
; INTERFACE_LINK_CAPACITY <Mbps>
|
||||
; INTERFACE_PORTS <comma separated list of ethernet interfaces>
|
||||
|
||||
[LOGICAL_INTERFACE_1]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
INTERFACE_LINK_CAPACITY=1000
|
||||
INTERFACE_PORTS=eth1
|
||||
|
||||
[LOGICAL_INTERFACE_2]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
;INTERFACE_LINK_CAPACITY=
|
||||
INTERFACE_PORTS=eth0
|
||||
|
||||
[CLM_NETWORK]
|
||||
|
|
|
@ -7,7 +7,6 @@ PXECONTROLLER_FLOATING_HOSTNAME = pxecontroller
|
|||
|
||||
[cMGMT]
|
||||
MANAGEMENT_MTU = 1500
|
||||
MANAGEMENT_LINK_CAPACITY = 1000
|
||||
MANAGEMENT_SUBNET = 192.168.204.0/24
|
||||
LAG_MANAGEMENT_INTERFACE = no
|
||||
MANAGEMENT_INTERFACE = eth1
|
||||
|
|
|
@ -10,21 +10,18 @@ SYSTEM_MODE = duplex
|
|||
; 4) 802.3ad (LACP) policy
|
||||
; Interface for pxebooting can only be LACP
|
||||
; INTERFACE_MTU <mtu size>
|
||||
; INTERFACE_LINK_CAPACITY <Mbps>
|
||||
; INTERFACE_PORTS <comma separated list of ethernet interfaces>
|
||||
|
||||
[LOGICAL_INTERFACE_1]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
INTERFACE_LINK_CAPACITY=1000
|
||||
INTERFACE_PORTS=eth1
|
||||
|
||||
[LOGICAL_INTERFACE_2]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
;INTERFACE_LINK_CAPACITY=
|
||||
INTERFACE_PORTS=eth0
|
||||
|
||||
[CLM_NETWORK]
|
||||
|
|
|
@ -10,21 +10,18 @@ SYSTEM_MODE = duplex
|
|||
; 4) 802.3ad (LACP) policy
|
||||
; Interface for pxebooting can only be LACP
|
||||
; INTERFACE_MTU <mtu size>
|
||||
; INTERFACE_LINK_CAPACITY <Mbps>
|
||||
; INTERFACE_PORTS <comma separated list of ethernet interfaces>
|
||||
|
||||
[LOGICAL_INTERFACE_1]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
INTERFACE_LINK_CAPACITY=1000
|
||||
INTERFACE_PORTS=eth1
|
||||
|
||||
[LOGICAL_INTERFACE_2]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
;INTERFACE_LINK_CAPACITY=
|
||||
INTERFACE_PORTS=eth0
|
||||
|
||||
[CLM_NETWORK]
|
||||
|
|
|
@ -7,7 +7,6 @@ PXECONTROLLER_FLOATING_HOSTNAME = pxecontroller
|
|||
|
||||
[cMGMT]
|
||||
MANAGEMENT_MTU = 1500
|
||||
MANAGEMENT_LINK_CAPACITY = 1000
|
||||
MANAGEMENT_SUBNET = 192.168.204.0/24
|
||||
LAG_MANAGEMENT_INTERFACE = no
|
||||
MANAGEMENT_INTERFACE = eth1
|
||||
|
|
|
@ -8,21 +8,18 @@ SYSTEM_MODE = duplex
|
|||
; 4) 802.3ad (LACP) policy
|
||||
; Interface for pxebooting can only be LACP
|
||||
; INTERFACE_MTU <mtu size>
|
||||
; INTERFACE_LINK_CAPACITY <Mbps>
|
||||
; INTERFACE_PORTS <comma separated list of ethernet interfaces>
|
||||
|
||||
[LOGICAL_INTERFACE_1]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
INTERFACE_LINK_CAPACITY=1000
|
||||
INTERFACE_PORTS=eth1
|
||||
|
||||
[LOGICAL_INTERFACE_2]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
;INTERFACE_LINK_CAPACITY=
|
||||
INTERFACE_PORTS=eth0
|
||||
|
||||
[MGMT_NETWORK]
|
||||
|
|
|
@ -5,21 +5,18 @@
|
|||
; 4) 802.3ad (LACP) policy
|
||||
; Interface for pxebooting can only be LACP
|
||||
; INTERFACE_MTU <mtu size>
|
||||
; INTERFACE_LINK_CAPACITY <Mbps>
|
||||
; INTERFACE_PORTS <comma separated list of ethernet interfaces>
|
||||
|
||||
[LOGICAL_INTERFACE_1]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
INTERFACE_LINK_CAPACITY=1000
|
||||
INTERFACE_PORTS=eth1
|
||||
|
||||
[LOGICAL_INTERFACE_2]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
;INTERFACE_LINK_CAPACITY=
|
||||
INTERFACE_PORTS=eth0
|
||||
|
||||
[MGMT_NETWORK]
|
||||
|
|
|
@ -8,14 +8,12 @@ SYSTEM_MODE=duplex
|
|||
; 4) 802.3ad (LACP) policy
|
||||
; Interface for pxebooting can only be LACP
|
||||
; INTERFACE_MTU <mtu size>
|
||||
; INTERFACE_LINK_CAPACITY <Mbps>
|
||||
; INTERFACE_PORTS <comma separated list of ethernet interfaces>
|
||||
|
||||
[LOGICAL_INTERFACE_1]
|
||||
LAG_INTERFACE=Y
|
||||
LAG_MODE=4
|
||||
INTERFACE_MTU=1500
|
||||
INTERFACE_LINK_CAPACITY=1000
|
||||
INTERFACE_PORTS=eth1,eth2
|
||||
|
||||
[MGMT_NETWORK]
|
||||
|
|
|
@ -5,21 +5,18 @@
|
|||
; 4) 802.3ad (LACP) policy
|
||||
; Interface for pxebooting can only be LACP
|
||||
; INTERFACE_MTU <mtu size>
|
||||
; INTERFACE_LINK_CAPACITY <Mbps>
|
||||
; INTERFACE_PORTS <comma separated list of ethernet interfaces>
|
||||
|
||||
[LOGICAL_INTERFACE_1]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
INTERFACE_LINK_CAPACITY=1000
|
||||
INTERFACE_PORTS=eth1
|
||||
|
||||
[LOGICAL_INTERFACE_2]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
;INTERFACE_LINK_CAPACITY=
|
||||
INTERFACE_PORTS=eth0
|
||||
|
||||
[MGMT_NETWORK]
|
||||
|
|
|
@ -15,21 +15,18 @@
|
|||
; 4) 802.3ad (LACP) policy
|
||||
; Interface for pxebooting can only be LACP
|
||||
; INTERFACE_MTU <mtu size>
|
||||
; INTERFACE_LINK_CAPACITY <Mbps>
|
||||
; INTERFACE_PORTS <comma separated list of ethernet interfaces>
|
||||
|
||||
[LOGICAL_INTERFACE_1]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
INTERFACE_LINK_CAPACITY=1000
|
||||
INTERFACE_PORTS=eth1
|
||||
|
||||
[LOGICAL_INTERFACE_2]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
;INTERFACE_LINK_CAPACITY=
|
||||
INTERFACE_PORTS=eth0
|
||||
|
||||
[MGMT_NETWORK]
|
||||
|
|
|
@ -15,21 +15,18 @@
|
|||
; 4) 802.3ad (LACP) policy
|
||||
; Interface for pxebooting can only be LACP
|
||||
; INTERFACE_MTU <mtu size>
|
||||
; INTERFACE_LINK_CAPACITY <Mbps>
|
||||
; INTERFACE_PORTS <comma separated list of ethernet interfaces>
|
||||
|
||||
[LOGICAL_INTERFACE_1]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
INTERFACE_LINK_CAPACITY=1000
|
||||
INTERFACE_PORTS=eth1
|
||||
|
||||
[LOGICAL_INTERFACE_2]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
;INTERFACE_LINK_CAPACITY=
|
||||
INTERFACE_PORTS=eth0
|
||||
|
||||
[OAM_NETWORK]
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
;INTERFACE_LINK_CAPACITY=
|
||||
INTERFACE_PORTS=eth0
|
||||
|
||||
[MGMT_NETWORK]
|
||||
|
|
|
@ -5,21 +5,18 @@
|
|||
; 4) 802.3ad (LACP) policy
|
||||
; Interface for pxebooting can only be LACP
|
||||
; INTERFACE_MTU <mtu size>
|
||||
; INTERFACE_LINK_CAPACITY <Mbps>
|
||||
; INTERFACE_PORTS <comma separated list of ethernet interfaces>
|
||||
|
||||
[LOGICAL_INTERFACE_1]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
INTERFACE_LINK_CAPACITY=1000
|
||||
INTERFACE_PORTS=eth1
|
||||
|
||||
[LOGICAL_INTERFACE_2]
|
||||
LAG_INTERFACE=N
|
||||
;LAG_MODE=
|
||||
INTERFACE_MTU=1500
|
||||
;INTERFACE_LINK_CAPACITY=
|
||||
INTERFACE_PORTS=eth0
|
||||
|
||||
[MGMT_NETWORK]
|
||||
|
|
Loading…
Reference in New Issue