openstack/deb-nova
Code Issues Proposed changes

Move osapi_compute_unique_server_name_scope to db

Browse Source 
This strange little option is only used within the DB layer.

blueprint: scope-config-opts
Change-Id: I10b0fef02a5fffd44094fe351cde683fc5c31442
This commit is contained in:
Mark McLoughlin
2013-01-08 07:50:47 +00:00
parent 4c43371fd5
commit 2803fd8d40
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/config.py
View File

@@ -50,11 +50,6 @@ global_opts = [
cfg.ListOpt('enabled_apis',
default=['ec2', 'osapi_compute', 'metadata'],
help='a list of APIs to enable by default'),
cfg.StrOpt('osapi_compute_unique_server_name_scope',
default='',
help='When set, compute API will consider duplicate hostnames '
'invalid within the specified scope, regardless of case. '
'Should be empty, "project" or "global".'),
cfg.StrOpt('default_instance_type',
default='m1.small',
help='default instance type to use, testing only'),

8
nova/db/sqlalchemy/api.py
View File

@@ -47,8 +47,16 @@ from nova.openstack.common import log as logging
from nova.openstack.common import timeutils
from nova.openstack.common import uuidutils
db_opts = [
cfg.StrOpt('osapi_compute_unique_server_name_scope',
default='',
help='When set, compute API will consider duplicate hostnames '
'invalid within the specified scope, regardless of case. '
'Should be empty, "project" or "global".'),
]
CONF = cfg.CONF
CONF.register_opts(db_opts)
CONF.import_opt('compute_topic', 'nova.compute.rpcapi')
CONF.import_opt('sql_connection', 'nova.db.sqlalchemy.session')