openstack/deb-manila
Code Issues Proposed changes

Merge "Collapse common os_region_name option"

Browse Source
This commit is contained in:
Jenkins 2016-03-14 18:26:20 +00:00 committed by Gerrit Code Review
commit cb97956e7a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manila/common/config.py
View File

@ -46,7 +46,10 @@ core_opts = [
help='File name for the paste.deploy config for manila-api.'),
cfg.StrOpt('state_path',
default='/var/lib/manila',
help="Top-level directory for maintaining manila's state."), ]
help="Top-level directory for maintaining manila's state."),
cfg.StrOpt('os_region_name',
help='Region name of this node.'),
]
debug_opts = [
]

4
manila/compute/nova.py
View File

@ -24,6 +24,7 @@ from oslo_config import cfg
from oslo_log import log
import six
from manila.common.config import core_opts
from manila.db import base
from manila import exception
from manila.i18n import _
@ -37,8 +38,6 @@ nova_opts = [
cfg.StrOpt('nova_catalog_admin_info',
default='compute:nova:adminURL',
help='Same as nova_catalog_info, but for admin endpoint.'),
cfg.StrOpt('os_region_name',
help='Region name of this node.'),
cfg.StrOpt('nova_ca_certificates_file',
help='Location of CA certificates file to use for nova client '
'requests.'),
@ -63,6 +62,7 @@ nova_opts = [
CONF = cfg.CONF
CONF.register_opts(nova_opts)
CONF.register_opts(core_opts)
LOG = log.getLogger(__name__)

4
manila/volume/cinder.py
View File

@ -26,6 +26,7 @@ from oslo_config import cfg
from oslo_log import log
import six
from manila.common.config import core_opts
import manila.context as ctxt
from manila.db import base
from manila import exception
@ -38,8 +39,6 @@ cinder_opts = [
help='Info to match when looking for cinder in the service '
'catalog. Format is separated values of the form: '
'<service_type>:<service_name>:<endpoint_type>'),
cfg.StrOpt('os_region_name',
help='Region name of this node.'),
cfg.StrOpt('cinder_ca_certificates_file',
help='Location of CA certificates file to use for cinder '
'client requests.'),
@ -68,6 +67,7 @@ cinder_opts = [
CONF = cfg.CONF
CONF.register_opts(cinder_opts)
CONF.register_opts(core_opts)
LOG = log.getLogger(__name__)