Merge "Fix IPv6 default masks for SLAAC"
This commit is contained in:
commit
6a2f546903
|
@ -747,10 +747,10 @@
|
|||
|
||||
# The cidr block to allocate tenant ipv6 subnets from (string
|
||||
# value)
|
||||
#tenant_network_v6_cidr=2003::/64
|
||||
#tenant_network_v6_cidr=2003::/48
|
||||
|
||||
# The mask bits for tenant ipv6 subnets (integer value)
|
||||
#tenant_network_v6_mask_bits=96
|
||||
#tenant_network_v6_mask_bits=64
|
||||
|
||||
# Whether tenant network connectivity should be evaluated
|
||||
# directly (boolean value)
|
||||
|
|
|
@ -129,6 +129,7 @@ class PortsTestJSON(base.BaseNetworkTest):
|
|||
for port in ports:
|
||||
self.assertEqual(sorted(fields), sorted(port.keys()))
|
||||
|
||||
@test.skip_because(bug="1364166")
|
||||
@test.attr(type='smoke')
|
||||
def test_update_port_with_second_ip(self):
|
||||
# Create a network with two subnets
|
||||
|
|
|
@ -419,10 +419,10 @@ NetworkGroup = [
|
|||
default=28,
|
||||
help="The mask bits for tenant ipv4 subnets"),
|
||||
cfg.StrOpt('tenant_network_v6_cidr',
|
||||
default="2003::/64",
|
||||
default="2003::/48",
|
||||
help="The cidr block to allocate tenant ipv6 subnets from"),
|
||||
cfg.IntOpt('tenant_network_v6_mask_bits',
|
||||
default=96,
|
||||
default=64,
|
||||
help="The mask bits for tenant ipv6 subnets"),
|
||||
cfg.BoolOpt('tenant_networks_reachable',
|
||||
default=False,
|
||||
|
|
Loading…
Reference in New Issue