diff --git a/tripleoclient/tests/v1/undercloud/test_config.py b/tripleoclient/tests/v1/undercloud/test_config.py index 7b3eda33b..efb53f3a7 100644 --- a/tripleoclient/tests/v1/undercloud/test_config.py +++ b/tripleoclient/tests/v1/undercloud/test_config.py @@ -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', diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index 57fff649f..5565ce216 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -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.