Merge "Remove docker_bip option"
This commit is contained in:
commit
3f18f854e5
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
`docker_bip` has been removed from the undercloud.conf
|
|
@ -224,12 +224,6 @@ class UndercloudConfig(StandaloneConfig):
|
||||||
default=1500,
|
default=1500,
|
||||||
help=_('MTU to use for the local_interface.')
|
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',
|
cfg.StrOpt('inspection_interface',
|
||||||
default='br-ctlplane',
|
default='br-ctlplane',
|
||||||
deprecated_name='discovery_interface',
|
deprecated_name='discovery_interface',
|
||||||
|
|
|
@ -37,7 +37,6 @@ class TestUndercloudConfig(base.TestCase):
|
||||||
'custom_env_files',
|
'custom_env_files',
|
||||||
'deployment_user',
|
'deployment_user',
|
||||||
'discovery_default_driver',
|
'discovery_default_driver',
|
||||||
'docker_bip',
|
|
||||||
'enable_node_discovery',
|
'enable_node_discovery',
|
||||||
'enable_routed_networks',
|
'enable_routed_networks',
|
||||||
'enable_swift_encryption',
|
'enable_swift_encryption',
|
||||||
|
@ -95,7 +94,6 @@ class TestUndercloudConfig(base.TestCase):
|
||||||
'custom_env_files',
|
'custom_env_files',
|
||||||
'deployment_user',
|
'deployment_user',
|
||||||
'discovery_default_driver',
|
'discovery_default_driver',
|
||||||
'docker_bip',
|
|
||||||
'enable_cinder',
|
'enable_cinder',
|
||||||
'enable_ironic',
|
'enable_ironic',
|
||||||
'enable_ironic_inspector',
|
'enable_ironic_inspector',
|
||||||
|
|
|
@ -531,10 +531,6 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
|
||||||
|
|
||||||
env_data['ContainerCli'] = CONF['container_cli']
|
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):
|
if CONF.get('container_registry_mirror', None):
|
||||||
env_data['DockerRegistryMirror'] = CONF['container_registry_mirror']
|
env_data['DockerRegistryMirror'] = CONF['container_registry_mirror']
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue