cebee2c4d7
This is a follow-up to: https://review.opendev.org/#/c/666897/ and makes sure titles and help information get rendered in the configuration documentation and configuration samples. The options for the placement_client group are already changed and left untouched as a result. The changes to grafana_client are already done in another patch and also untouched. Change-Id: Ia33cd4576e4b55e651f3f3779a01f2867126138d
63 lines
2.5 KiB
Python
63 lines
2.5 KiB
Python
# -*- encoding: utf-8 -*-
|
|
# Copyright 2014
|
|
# The Cloudscaling Group, Inc.
|
|
# Copyright (c) 2016 Intel Corp
|
|
#
|
|
# 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 ka_loading
|
|
|
|
from watcher.conf import api as conf_api
|
|
from watcher.conf import applier as conf_applier
|
|
from watcher.conf import ceilometer_client as conf_ceilometer_client
|
|
from watcher.conf import cinder_client as conf_cinder_client
|
|
from watcher.conf import clients_auth as conf_auth
|
|
from watcher.conf import db
|
|
from watcher.conf import decision_engine as conf_de
|
|
from watcher.conf import exception
|
|
from watcher.conf import glance_client as conf_glance_client
|
|
from watcher.conf import neutron_client as conf_neutron_client
|
|
from watcher.conf import nova_client as conf_nova_client
|
|
from watcher.conf import paths
|
|
from watcher.conf import planner as conf_planner
|
|
|
|
|
|
def list_opts():
|
|
"""Legacy aggregation of all the watcher config options"""
|
|
return [
|
|
('DEFAULT',
|
|
(conf_api.AUTH_OPTS +
|
|
exception.EXC_LOG_OPTS +
|
|
paths.PATH_OPTS)),
|
|
(conf_api.api, conf_api.API_SERVICE_OPTS),
|
|
(db.database, db.SQL_OPTS),
|
|
(conf_planner.watcher_planner, conf_planner.WATCHER_PLANNER_OPTS),
|
|
(conf_applier.watcher_applier, conf_applier.APPLIER_MANAGER_OPTS),
|
|
(conf_de.watcher_decision_engine,
|
|
(conf_de.WATCHER_DECISION_ENGINE_OPTS)),
|
|
(conf_nova_client.nova_client, conf_nova_client.NOVA_CLIENT_OPTS),
|
|
(conf_glance_client.glance_client,
|
|
conf_glance_client.GLANCE_CLIENT_OPTS),
|
|
(conf_cinder_client.cinder_client,
|
|
conf_cinder_client.CINDER_CLIENT_OPTS),
|
|
(conf_ceilometer_client.ceilometer_client,
|
|
conf_ceilometer_client.CEILOMETER_CLIENT_OPTS),
|
|
(conf_neutron_client.neutron_client,
|
|
conf_neutron_client.NEUTRON_CLIENT_OPTS),
|
|
(conf_auth.WATCHER_CLIENTS_AUTH,
|
|
(ka_loading.get_auth_common_conf_options() +
|
|
ka_loading.get_auth_plugin_conf_options('password') +
|
|
ka_loading.get_session_conf_options()))
|
|
]
|