diff --git a/manila/common/config.py b/manila/common/config.py index d478265b..1d79ffa1 100644 --- a/manila/common/config.py +++ b/manila/common/config.py @@ -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 = [ ] diff --git a/manila/compute/nova.py b/manila/compute/nova.py index 2e742f2c..39004368 100644 --- a/manila/compute/nova.py +++ b/manila/compute/nova.py @@ -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__) diff --git a/manila/volume/cinder.py b/manila/volume/cinder.py index 9e6ba72b..7f33ba25 100644 --- a/manila/volume/cinder.py +++ b/manila/volume/cinder.py @@ -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: ' '::'), - 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__)