Merge "conf: Deprecate 'allow_same_net_traffic'"

2017-04-05 20:28:22 +00:00 · 2017-04-05 20:28:22 +00:00 · c5c600de4a
parent 683295d740 2cb4151e7f
commit c5c600de4a
2 changed files with 6 additions and 0 deletions
--- a/nova/conf/network.py
+++ b/nova/conf/network.py
@ -1142,6 +1142,11 @@ Related options:
 """),
    cfg.BoolOpt('allow_same_net_traffic',
        default=True,
+        deprecated_for_removal=True,
+        deprecated_since='16.0.0',
+        deprecated_reason="""
+nova-network is deprecated, as are any related configuration options.
+""",
        help="""
 Determine whether to allow network traffic from same network.

--- a/releasenotes/notes/deprecate-more-nova-network-opts-a9f87c79f7d26438.yaml
+++ b/releasenotes/notes/deprecate-more-nova-network-opts-a9f87c79f7d26438.yaml
@ -43,3 +43,4 @@ deprecations:
    - ``public_interface``
    - ``routing_source_ip``
    - ``use_ipv6``
+    - ``allow_same_net_traffic``