Add docker bridge ip option to the undercloud.conf

Add docker_bip option to the undercloud.conf in order
to easily override the value of: DockerNetworkOptions
through the undercloud.conf

Change-Id: Ibbf7c6101539bdf575c23295c1b9fa4bfc84cff7
This commit is contained in:
Mathieu Bultel 2018-11-14 23:19:01 +01:00
parent 31aef3859e
commit a22bb05190
3 changed files with 8 additions and 1 deletions

View File

@ -188,6 +188,10 @@ class UndercloudConfig(StandaloneConfig):
default=1500,
help=_('MTU to use for the local_interface.')
),
cfg.StrOpt('docker_bip',
default='--bip=172.31.0.1/24',
help=_('Docker bridge IP for the undercloud.')
),
cfg.StrOpt('inspection_interface',
default='br-ctlplane',

View File

@ -34,6 +34,7 @@ class TestUndercloudConfig(base.TestCase):
'custom_env_files',
'deployment_user',
'discovery_default_driver',
'docker_bip',
'docker_insecure_registries',
'docker_registry_mirror',
'enable_node_discovery',
@ -85,6 +86,7 @@ class TestUndercloudConfig(base.TestCase):
'custom_env_files',
'deployment_user',
'discovery_default_driver',
'docker_bip',
'docker_insecure_registries',
'docker_registry_mirror',
'enable_cinder',

View File

@ -70,7 +70,8 @@ PARAMETER_MAPPING = {
'upgrade_cleanup': 'UpgradeRemoveUnusedPackages',
'local_subnet': 'UndercloudCtlplaneLocalSubnet',
'enable_routed_networks': 'UndercloudEnableRoutedNetworks',
'local_interface': 'NeutronPublicInterface'
'local_interface': 'NeutronPublicInterface',
'docker_bip': 'DockerNetworkOptions'
}
SUBNET_PARAMETER_MAPPING = {