openstack
/
horizon
Code Issues Proposed changes

Merge "Warn OPENSTACK_QUANTUM_NETWORK setting as deprecated" into proposed/juno

This commit is contained in:
Jenkins 2014-10-11 09:32:06 +00:00 committed by Gerrit Code Review
parent 3a64723917 f1a8abb925
commit ce839aa58d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/api/neutron.py
View File

@ -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)