Make routed networks optional
Closes-Bug: #1749671 Change-Id: Ieabb2ded33ec0c0b68f21c9afa16a9baddc61393
This commit is contained in:
parent
8a7609ec48
commit
52dbe134ab
|
@ -42,6 +42,7 @@ class BaseTestCase(base.BaseTestCase):
|
||||||
super(BaseTestCase, self).setUp()
|
super(BaseTestCase, self).setUp()
|
||||||
self.logger = self.useFixture(log.ConfigureLogging()).logger
|
self.logger = self.useFixture(log.ConfigureLogging()).logger
|
||||||
self.conf = self.useFixture(config_fixture.Config())
|
self.conf = self.useFixture(config_fixture.Config())
|
||||||
|
self.conf.config(enable_routed_networks=True)
|
||||||
# ctlplane-subnet - config group options
|
# ctlplane-subnet - config group options
|
||||||
self.grp0 = cfg.OptGroup(name='ctlplane-subnet',
|
self.grp0 = cfg.OptGroup(name='ctlplane-subnet',
|
||||||
title='ctlplane-subnet')
|
title='ctlplane-subnet')
|
||||||
|
|
|
@ -405,6 +405,9 @@ _opts = [
|
||||||
help=('List of additional architectures enabled in your cloud '
|
help=('List of additional architectures enabled in your cloud '
|
||||||
'environment. The list of supported values is: %s'
|
'environment. The list of supported values is: %s'
|
||||||
% ' '.join(validator.SUPPORTED_ARCHITECTURES))),
|
% ' '.join(validator.SUPPORTED_ARCHITECTURES))),
|
||||||
|
cfg.BoolOpt('enable_routed_networks',
|
||||||
|
default=False,
|
||||||
|
help=('Enable support for routed ctlplane networks.')),
|
||||||
]
|
]
|
||||||
|
|
||||||
# Routed subnets
|
# Routed subnets
|
||||||
|
@ -2216,10 +2219,21 @@ def _config_neutron_segments_and_subnets(sdk, ctlplane_id):
|
||||||
else:
|
else:
|
||||||
segment = _neutron_segment_create(sdk, name,
|
segment = _neutron_segment_create(sdk, name,
|
||||||
ctlplane_id, phynet)
|
ctlplane_id, phynet)
|
||||||
subnet = _neutron_subnet_create(sdk, ctlplane_id, s.cidr,
|
if CONF.enable_routed_networks:
|
||||||
s.gateway, host_routes,
|
subnet = _neutron_subnet_create(sdk, ctlplane_id, s.cidr,
|
||||||
allocation_pool, name,
|
s.gateway, host_routes,
|
||||||
segment.id)
|
allocation_pool, name,
|
||||||
|
segment.id)
|
||||||
|
elif name == CONF.local_subnet:
|
||||||
|
# Create subnet with segment_id: None if routed networks
|
||||||
|
# is not enabled.
|
||||||
|
# TODO(hjensas): Deprecate option and remove this once
|
||||||
|
# tripleo-ui can support managing baremetal port
|
||||||
|
# attributes.
|
||||||
|
subnet = _neutron_subnet_create(sdk, ctlplane_id, s.cidr,
|
||||||
|
s.gateway, host_routes,
|
||||||
|
allocation_pool, name,
|
||||||
|
None)
|
||||||
|
|
||||||
# If the subnet is IPv6 we need to start a router so that router
|
# If the subnet is IPv6 we need to start a router so that router
|
||||||
# advertisments are sent out for stateless IP addressing to work.
|
# advertisments are sent out for stateless IP addressing to work.
|
||||||
|
|
|
@ -192,7 +192,8 @@
|
||||||
# undercloud. (boolean value)
|
# undercloud. (boolean value)
|
||||||
#enable_container_images_build = true
|
#enable_container_images_build = true
|
||||||
|
|
||||||
# Whether to install the Octavia client. (boolean value)
|
# Whether to install the Octavia client in the Undercloud. (boolean
|
||||||
|
# value)
|
||||||
#enable_octavia = false
|
#enable_octavia = false
|
||||||
|
|
||||||
# One Time Password to register Undercloud node with an IPA server.
|
# One Time Password to register Undercloud node with an IPA server.
|
||||||
|
@ -233,6 +234,9 @@
|
||||||
# The list of supported values is: ppc64le (list value)
|
# The list of supported values is: ppc64le (list value)
|
||||||
#additional_architectures =
|
#additional_architectures =
|
||||||
|
|
||||||
|
# Enable support for routed ctlplane networks. (boolean value)
|
||||||
|
#enable_routed_networks = false
|
||||||
|
|
||||||
|
|
||||||
[auth]
|
[auth]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue