Undercloud: Remove deprecated/removed IPv6 parameters
- The NovaIPv6 parameter existed in old releases such as Newton but it was removed before Queens. - RabbitIPv6, MemcachedIPv6, RedisIPv6 and MysqlIPv6 are all deprecated and have no effect now[1]. - The IronicIpVersion parameter was already deprecated and has had no effect since then[2]. [1] a03f33a7d4bcae0cacc0bd904f35e78935e24599 [2] 716492274ebd8b6674e72c7f568656362030c093 Change-Id: Id4647c734ed06ce98b83792da8cfaf761af8a631
This commit is contained in:
@@ -215,12 +215,6 @@ class TestNetworkSettings(TestBaseNetworkSettings):
|
||||
group='ctlplane-subnet')
|
||||
undercloud_config._process_network_args(env)
|
||||
expected = {
|
||||
'NovaIPv6': True,
|
||||
'RabbitIPv6': True,
|
||||
'MemcachedIPv6': True,
|
||||
'RedisIPv6': True,
|
||||
'MysqlIPv6': True,
|
||||
'IronicIpVersion': '6',
|
||||
'ControlPlaneStaticRoutes': [],
|
||||
'IronicInspectorSubnets': [
|
||||
{'gateway': 'fd12:3456:789a:1::1',
|
||||
@@ -265,12 +259,6 @@ class TestNetworkSettings(TestBaseNetworkSettings):
|
||||
group='ctlplane-subnet')
|
||||
undercloud_config._process_network_args(env)
|
||||
expected = {
|
||||
'NovaIPv6': True,
|
||||
'RabbitIPv6': True,
|
||||
'MemcachedIPv6': True,
|
||||
'RedisIPv6': True,
|
||||
'MysqlIPv6': True,
|
||||
'IronicIpVersion': '6',
|
||||
'ControlPlaneStaticRoutes': [],
|
||||
'IronicInspectorSubnets': [
|
||||
{'gateway': 'fd12:3456:789a:1::1',
|
||||
|
||||
@@ -390,13 +390,6 @@ def _process_network_args(env):
|
||||
'Please provide less than 6 '
|
||||
'servers in undercloud_'
|
||||
'nameservers.')
|
||||
if netaddr.IPNetwork(CONF['local_ip']).version == 6:
|
||||
env['NovaIPv6'] = True
|
||||
env['RabbitIPv6'] = True
|
||||
env['MemcachedIPv6'] = True
|
||||
env['RedisIPv6'] = True
|
||||
env['MysqlIPv6'] = True
|
||||
env['IronicIpVersion'] = '6'
|
||||
|
||||
# We do not use undercloud ips for env, but just validate the configured
|
||||
# value here.
|
||||
|
||||
Reference in New Issue
Block a user