openstack/horizon
Code Issues Proposed changes

Merge "Remove deprecated OPENSTACK_QUANTUM_NETWORK"

Browse Source
This commit is contained in:
Jenkins 2015-04-28 18:53:43 +00:00 committed by Gerrit Code Review
commit 2e96799ab0
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openstack_dashboard/api/neutron.py
View File

@ -21,7 +21,6 @@ from __future__ import absolute_import
import collections
import logging
import warnings
import netaddr
@ -1083,14 +1082,7 @@ 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', {}))
network_config = getattr(settings, 'OPENSTACK_NEUTRON_NETWORK', {})
return network_config.get(name, default)