Merge "Warn OPENSTACK_QUANTUM_NETWORK setting as deprecated" into proposed/juno2014.2.rc22014.2proposed/juno

1 files changed, 7 insertions, 0 deletions

diff --git a/openstack_dashboard/api/neutron.py b/openstack_dashboard/api/neutron.py
index 4dccc6fb0..b8aa880df 100644
--- a/openstack_dashboard/api/neutron.py
+++ b/openstack_dashboard/api/neutron.py
@@ -21,6 +21,7 @@ from __future__ import absolute_import
 
 import collections
 import logging
+import warnings
 
 import netaddr
 
@@ -936,6 +937,12 @@ def is_extension_supported(request, extension_alias):
 
 
 def is_enabled_by_config(name, default=True):
+    if hasattr(settings, 'OPENSTACK_QUANTUM_NETWORK'):
+        warnings.warn(
+            'OPENSTACK_QUANTUM_NETWORK setting is deprecated and will be '
+            'removed in the near future. '
+            'Please use OPENSTACK_NEUTRON_NETWORK instead.',
+            DeprecationWarning)
     network_config = (getattr(settings, 'OPENSTACK_NEUTRON_NETWORK', {}) or
                       getattr(settings, 'OPENSTACK_QUANTUM_NETWORK', {}))
     return network_config.get(name, default)