openstack/nova
Code Issues Proposed changes

Merge "Added conf support for security groups"

Browse Source
This commit is contained in:
Jenkins 2012-12-18 18:52:06 +00:00 committed by Gerrit Code Review
commit 0e4076ebbd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/compute/api.py
View File

@ -81,6 +81,9 @@ compute_opts = [
cfg.StrOpt('security_group_handler', cfg.StrOpt('security_group_handler',
default='nova.network.sg.NullSecurityGroupHandler', default='nova.network.sg.NullSecurityGroupHandler',
help='The full class name of the security group handler class'), help='The full class name of the security group handler class'),
cfg.StrOpt('security_group_api',
default='nova.compute.api.SecurityGroupAPI',
help='The full class name of the security API class'),
] ]
@ -165,7 +168,9 @@ class API(base.Base):
self.network_api = network_api or network.API() self.network_api = network_api or network.API()
self.volume_api = volume_api or volume.API() self.volume_api = volume_api or volume.API()
self.security_group_api = security_group_api or SecurityGroupAPI() self.security_group_api = (security_group_api or
importutils.import_object(
CONF.security_group_api))
self.sgh = importutils.import_object(CONF.security_group_handler) self.sgh = importutils.import_object(CONF.security_group_handler)
self.consoleauth_rpcapi = consoleauth_rpcapi.ConsoleAuthAPI() self.consoleauth_rpcapi = consoleauth_rpcapi.ConsoleAuthAPI()
self.scheduler_rpcapi = scheduler_rpcapi.SchedulerAPI() self.scheduler_rpcapi = scheduler_rpcapi.SchedulerAPI()