diff --git a/releasenotes/notes/remove-docker_bip-20d0249b45078dc2.yaml b/releasenotes/notes/remove-docker_bip-20d0249b45078dc2.yaml new file mode 100644 index 000000000..8241e51fa --- /dev/null +++ b/releasenotes/notes/remove-docker_bip-20d0249b45078dc2.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + `docker_bip` has been removed from the undercloud.conf diff --git a/tripleoclient/config/undercloud.py b/tripleoclient/config/undercloud.py index 12fdb25c6..4216d7018 100644 --- a/tripleoclient/config/undercloud.py +++ b/tripleoclient/config/undercloud.py @@ -224,12 +224,6 @@ class UndercloudConfig(StandaloneConfig): default=1500, help=_('MTU to use for the local_interface.') ), - cfg.StrOpt('docker_bip', - default='--bip=172.31.0.1/24', - deprecated_for_removal=True, - help=_('Docker bridge IP for the undercloud.') - ), - cfg.StrOpt('inspection_interface', default='br-ctlplane', deprecated_name='discovery_interface', diff --git a/tripleoclient/tests/config/test_config_undercloud.py b/tripleoclient/tests/config/test_config_undercloud.py index 5ad322d1e..e67871b04 100644 --- a/tripleoclient/tests/config/test_config_undercloud.py +++ b/tripleoclient/tests/config/test_config_undercloud.py @@ -37,7 +37,6 @@ class TestUndercloudConfig(base.TestCase): 'custom_env_files', 'deployment_user', 'discovery_default_driver', - 'docker_bip', 'enable_node_discovery', 'enable_routed_networks', 'enable_swift_encryption', @@ -95,7 +94,6 @@ class TestUndercloudConfig(base.TestCase): 'custom_env_files', 'deployment_user', 'discovery_default_driver', - 'docker_bip', 'enable_cinder', 'enable_ironic', 'enable_ironic_inspector', diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py index 365b27b6f..e9a76cb0e 100644 --- a/tripleoclient/v1/undercloud_config.py +++ b/tripleoclient/v1/undercloud_config.py @@ -531,10 +531,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True, env_data['ContainerCli'] = CONF['container_cli'] - # NOTE(aschultz): deprecated in Stein - if CONF.get('docker_bip', None): - env_data['DockerNetworkOptions'] = CONF['docker_bip'] - if CONF.get('container_registry_mirror', None): env_data['DockerRegistryMirror'] = CONF['container_registry_mirror']