summaryrefslogtreecommitdiff
path: root/neutron/opts.py
diff options
context:
space:
mode:
authorAradhana Singh <aradhana1.singh@intel.com>2016-04-19 22:03:27 +0000
committerDariusz Smigiel <smigiel.dariusz@gmail.com>2016-05-11 09:15:38 -0500
commit97372a1431d9f80bda7bdfd1cd494aeeecf3df53 (patch)
tree497f96f79d1541daf352aca98988de1be29fb827 /neutron/opts.py
parent60db12f9d2f8a44d411e2ee8742c33be08078864 (diff)
downloadneutron-97372a1431d9f80bda7bdfd1cd494aeeecf3df53.tar.gz
Refactoring config options for quota
Refactoring Neutron configuration options for quota to be in neutron/conf. This will allow centralization of all configuration options and provide an easy way to import. It is similar to the Nova implementation found here: http://specs.openstack.org/openstack/nova-specs/specs/mitaka/implemented/centralize-config-options.html Partial-Bug: #1563069 Change-Id: I7723ba9b24dd5cf74b321bd0fc54df0666594bbc
Diffstat (limited to 'neutron/opts.py')
-rw-r--r--neutron/opts.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/neutron/opts.py b/neutron/opts.py
index 23e47962b7..83254cdd7b 100644
--- a/neutron/opts.py
+++ b/neutron/opts.py
@@ -29,6 +29,7 @@ import neutron.agent.linux.ra
import neutron.agent.metadata.config
import neutron.agent.ovsdb.api
import neutron.agent.securitygroups_rpc
+import neutron.conf.quota
import neutron.db.agents_db
import neutron.db.agentschedulers_db
import neutron.db.dvr_mac_db
@@ -54,7 +55,6 @@ import neutron.plugins.ml2.drivers.type_geneve
import neutron.plugins.ml2.drivers.type_gre
import neutron.plugins.ml2.drivers.type_vlan
import neutron.plugins.ml2.drivers.type_vxlan
-import neutron.quota
import neutron.service
import neutron.services.metering.agents.metering_agent
import neutron.services.qos.notification_drivers.manager
@@ -101,8 +101,8 @@ def list_extension_opts():
neutron.extensions.allowedaddresspairs.allowed_address_pair_opts),
('quotas',
itertools.chain(
- neutron.extensions.l3.l3_quota_opts,
- neutron.extensions.securitygroup.security_group_quota_opts)
+ neutron.conf.quota.l3_quota_opts,
+ neutron.conf.quota.security_group_quota_opts)
)
]
@@ -138,7 +138,7 @@ def list_opts():
itertools.chain(
neutron.common.config.nova_opts)
),
- ('quotas', neutron.quota.quota_opts)
+ ('quotas', neutron.conf.quota.core_quota_opts)
]