faa59b8893
This option has been removed from drivers.utils in [1] so it fails when trying to build config file with oslo-config-generator. This patch is just removing that config opts from the list of kuryr-k8s config opts. [1] https://review.opendev.org/#/c/718389/ Change-Id: Ib579bc4c2338a3880bfe58a3d5bdbc1163ed8c7e
63 lines
2.5 KiB
Python
63 lines
2.5 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.
|
|
import copy
|
|
|
|
from oslo_log import _options
|
|
|
|
from kuryr.lib import opts as lib_opts
|
|
from kuryr_kubernetes.cni import health as cni_health
|
|
from kuryr_kubernetes import config
|
|
from kuryr_kubernetes.controller.drivers import namespace_subnet
|
|
from kuryr_kubernetes.controller.drivers import vif_pool
|
|
from kuryr_kubernetes.controller.managers import health
|
|
from kuryr_kubernetes.controller.managers import pool
|
|
from kuryr_kubernetes import utils
|
|
|
|
_kuryr_k8s_opts = [
|
|
('kubernetes', config.k8s_opts),
|
|
('kuryr-kubernetes', config.kuryr_k8s_opts),
|
|
('neutron_defaults', config.neutron_defaults),
|
|
('pod_vif_nested', config.nested_vif_driver_opts),
|
|
('vif_pool', vif_pool.vif_pool_driver_opts),
|
|
('octavia_defaults', config.octavia_defaults),
|
|
('cache_defaults', config.cache_defaults),
|
|
('subnet_caching', utils.subnet_caching_opts),
|
|
('node_driver_caching', vif_pool.node_vif_driver_caching_opts),
|
|
('pool_manager', pool.pool_manager_opts),
|
|
('cni_daemon', config.daemon_opts),
|
|
('health_server', health.health_server_opts),
|
|
('cni_health_server', cni_health.cni_health_server_opts),
|
|
('namespace_subnet', namespace_subnet.namespace_subnet_driver_opts),
|
|
('sriov', config.sriov_opts),
|
|
]
|
|
|
|
|
|
def list_kuryr_opts():
|
|
"""Return a list of oslo_config options available in Kuryr service.
|
|
|
|
Each element of the list is a tuple. The first element is the name of the
|
|
group under which the list of elements in the second element will be
|
|
registered. A group name of None corresponds to the [DEFAULT] group in
|
|
config files.
|
|
|
|
This function is also discoverable via the 'kuryr' entry point under
|
|
the 'oslo_config.opts' namespace.
|
|
|
|
The purpose of this is to allow tools like the Oslo sample config file
|
|
generator to discover the options exposed to users by Kuryr.
|
|
|
|
:returns: a list of (group_name, opts) tuples
|
|
"""
|
|
|
|
return ([(k, copy.deepcopy(o)) for k, o in _kuryr_k8s_opts] +
|
|
lib_opts.list_kuryr_opts() + _options.list_opts())
|