Merge "rt: ensure resource provider records exist from RT"

This commit is contained in:
Jenkins 2016-08-31 15:39:15 +00:00 committed by Gerrit Code Review
commit 4334f1f8a2
2 changed files with 46 additions and 0 deletions

View File

@ -67,6 +67,7 @@ from nova.conf import novnc
from nova.conf import osapi_v21 from nova.conf import osapi_v21
from nova.conf import paths from nova.conf import paths
from nova.conf import pci from nova.conf import pci
from nova.conf import placement
from nova.conf import quota from nova.conf import quota
from nova.conf import rdp from nova.conf import rdp
from nova.conf import remote_debug from nova.conf import remote_debug
@ -141,6 +142,7 @@ novnc.register_opts(CONF)
osapi_v21.register_opts(CONF) osapi_v21.register_opts(CONF)
paths.register_opts(CONF) paths.register_opts(CONF)
pci.register_opts(CONF) pci.register_opts(CONF)
placement.register_opts(CONF)
quota.register_opts(CONF) quota.register_opts(CONF)
rdp.register_opts(CONF) rdp.register_opts(CONF)
rpc.register_opts(CONF) rpc.register_opts(CONF)

44
nova/conf/placement.py Normal file
View File

@ -0,0 +1,44 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from keystoneauth1 import loading as ks_loading
from oslo_config import cfg
placement_group = cfg.OptGroup(
'placement',
title='Placement Service Options',
help="Configuration options for connecting to the placement API service")
placement_opts = [
cfg.StrOpt('os_region_name',
help="""
Region name of this node. This is used when picking the URL in the service
catalog.
Possible values:
* Any string representing region name
"""),
]
def register_opts(conf):
conf.register_group(placement_group)
conf.register_opts(placement_opts, group=placement_group)
ks_loading.register_auth_conf_options(conf,
placement_group.name)
def list_opts():
return {
placement_group.name: placement_opts
}