Remove deprecated network config options
Below network config options have been deprecated with
new names long back
- Ied68c0326cf891a4e6eb3db51dc5f43241e4b8d2
- 'tenant_network_cidr' -> 'project_network_cidr'
- 'tenant_network_mask_bits' -> 'project_network_mask_bits'
- 'tenant_network_v6_cidr' -> 'project_network_v6_cidr'
- 'tenant_network_v6_mask_bits' -> 'project_network_v6_mask_bits'
- 'tenant_networks_reachable' -> 'project_networks_reachable'
This patch removes them from tempest conf.
Devstack already use the new config options.
Change-Id: Ic0c39e607265f1b8e60caaacd11912ba9d558e01
Depends-On: I31f83ec70b8803a29a7be765661517d890ffd6f1
diff --git a/releasenotes/notes/remove-deprecated-network-config-options-f9ce276231578fe6.yaml b/releasenotes/notes/remove-deprecated-network-config-options-f9ce276231578fe6.yaml
new file mode 100644
index 0000000..e445fb3
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-network-config-options-f9ce276231578fe6.yaml
@@ -0,0 +1,11 @@
+---
+upgrade:
+ - |
+ Below deprecated network config options have been removed.
+ Those config options already been renamed to below meaningful names.
+
+ - ``tenant_network_cidr`` (removed) -> ``project_network_cidr``
+ - ``tenant_network_mask_bits`` (removed) -> ``project_network_mask_bits``
+ - ``tenant_network_v6_cidr`` (removed) -> ``project_network_v6_cidr``
+ - ``tenant_network_v6_mask_bits`` (removed) -> ``project_network_v6_mask_bits``
+ - ``tenant_networks_reachable`` (removed) -> ``project_networks_reachable``
diff --git a/tempest/config.py b/tempest/config.py
index fe8c175..b7312fd 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -537,23 +537,18 @@
'publicURL', 'adminURL', 'internalURL'],
help="The endpoint type to use for the network service."),
cfg.StrOpt('project_network_cidr',
- deprecated_name='tenant_network_cidr',
default="10.100.0.0/16",
help="The cidr block to allocate project ipv4 subnets from"),
cfg.IntOpt('project_network_mask_bits',
- deprecated_name='tenant_network_mask_bits',
default=28,
help="The mask bits for project ipv4 subnets"),
cfg.StrOpt('project_network_v6_cidr',
- deprecated_name='tenant_network_v6_cidr',
default="2003::/48",
help="The cidr block to allocate project ipv6 subnets from"),
cfg.IntOpt('project_network_v6_mask_bits',
- deprecated_name='tenant_network_v6_mask_bits',
default=64,
help="The mask bits for project ipv6 subnets"),
cfg.BoolOpt('project_networks_reachable',
- deprecated_name='tenant_networks_reachable',
default=False,
help="Whether project networks can be reached directly from "
"the test client. This must be set to True when the "