Merge "Add docker bridge ip option to the undercloud.conf"

tripleoclient/config/undercloud.py

@@ -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',

tripleoclient/tests/config/test_config_undercloud.py

@@ -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',

tripleoclient/v1/undercloud_config.py

@@ -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 = {