Merge "Fix branch regex for unmaintained branch model"
diff --git a/releasenotes/notes/remove-dns_servers_option-f49fdb2b4eb50f8f.yaml b/releasenotes/notes/remove-dns_servers_option-f49fdb2b4eb50f8f.yaml
new file mode 100644
index 0000000..6be1db9
--- /dev/null
+++ b/releasenotes/notes/remove-dns_servers_option-f49fdb2b4eb50f8f.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ The deprecated ``[network] dns_servers`` option has been removed.
diff --git a/tempest/config.py b/tempest/config.py
index 8ed1ff6..0a084ea 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -766,13 +766,6 @@
default=1,
help="Time in seconds between network operation status "
"checks."),
- cfg.ListOpt('dns_servers',
- default=["8.8.8.8", "8.8.4.4"],
- help="List of dns servers which should be used"
- " for subnet creation",
- deprecated_for_removal=True,
- deprecated_reason="This config option is no longer "
- "used anywhere, so it can be removed."),
cfg.StrOpt('port_vnic_type',
choices=[None, 'normal', 'direct', 'macvtap', 'direct-physical',
'baremetal', 'virtio-forwarder'],