b5162f731b
The keystoneauth1 opts were included in the [placement] config group in nova to define how nova was supposed to talk to the placement service that it discovered in its service catalog. Placement doesn't need to talk to itself, and for the time being it doesn't need to talk to anyone else but the database, so we can remove the settings. We do not need to deprecate them because we have already declared that a "fresh config" is required and we haven't had a release yet. If people have the settings in their config files they simply won't be used. Similar settings are registered in the [keystone] group which will be cleaned up in a separate change (note that the [keystone] group is not the same as the [keystone_authtoken] group which is used by the authtoken API middleware). There's no test coverage for these because any tests which would have used them are still in nova. Integration tests will make sure this change is fine. Change-Id: I180a4df89d8338dc640dc2c5638775c65bde1cb7
88 lines
3.3 KiB
Python
88 lines
3.3 KiB
Python
# 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 __future__ import absolute_import
|
|
|
|
from oslo_config import cfg
|
|
|
|
|
|
DEFAULT_CONSUMER_MISSING_ID = '00000000-0000-0000-0000-000000000000'
|
|
|
|
placement_group = cfg.OptGroup(
|
|
'placement',
|
|
title='Placement Service Options',
|
|
help="Configuration options for connecting to the placement API service")
|
|
|
|
placement_opts = [
|
|
cfg.BoolOpt(
|
|
'randomize_allocation_candidates',
|
|
default=False,
|
|
help="""
|
|
If True, when limiting allocation candidate results, the results will be
|
|
a random sampling of the full result set. If False, allocation candidates
|
|
are returned in a deterministic but undefined order. That is, all things
|
|
being equal, two requests for allocation candidates will return the same
|
|
results in the same order; but no guarantees are made as to how that order
|
|
is determined.
|
|
"""),
|
|
# TODO(mriedem): When placement is split out of nova, this should be
|
|
# deprecated since then [oslo_policy]/policy_file can be used.
|
|
cfg.StrOpt(
|
|
'policy_file',
|
|
# This default matches what is in
|
|
# etc/nova/policy-generator.conf
|
|
default='policy.yaml',
|
|
help='The file that defines placement policies. This can be an '
|
|
'absolute path or relative to the configuration file.'),
|
|
cfg.StrOpt(
|
|
'incomplete_consumer_project_id',
|
|
default=DEFAULT_CONSUMER_MISSING_ID,
|
|
help="""
|
|
Early API microversions (<1.8) allowed creating allocations and not specifying
|
|
a project or user identifier for the consumer. In cleaning up the data
|
|
modeling, we no longer allow missing project and user information. If an older
|
|
client makes an allocation, we'll use this in place of the information it
|
|
doesn't provide.
|
|
"""),
|
|
cfg.StrOpt(
|
|
'incomplete_consumer_user_id',
|
|
default=DEFAULT_CONSUMER_MISSING_ID,
|
|
help="""
|
|
Early API microversions (<1.8) allowed creating allocations and not specifying
|
|
a project or user identifier for the consumer. In cleaning up the data
|
|
modeling, we no longer allow missing project and user information. If an older
|
|
client makes an allocation, we'll use this in place of the information it
|
|
doesn't provide.
|
|
"""),
|
|
]
|
|
|
|
|
|
# Duplicate log_options from oslo_service so that we don't have to import
|
|
# that package into placement.
|
|
# NOTE(cdent): Doing so ends up requiring eventlet and other unnecessary
|
|
# packages for just this one setting.
|
|
service_opts = [
|
|
cfg.BoolOpt('log_options',
|
|
default=True,
|
|
help='Enables or disables logging values of all registered '
|
|
'options when starting a service (at DEBUG level).'),
|
|
]
|
|
|
|
|
|
def register_opts(conf):
|
|
conf.register_group(placement_group)
|
|
conf.register_opts(placement_opts, group=placement_group)
|
|
conf.register_opts(service_opts)
|
|
|
|
|
|
def list_opts():
|
|
return {placement_group.name: placement_opts}
|