111a056c0f
As it stands, the opts.py file that is passed into
oslo-config-generator isn't being generated dynamically
and the old way of generating the cinder.conf.sample is
dependent on oslo-incubator which Cinder is trying to
move away from. oslo-config-generator works differently
than oslo-incubator so a number of changes had to be made
in order to make this switch.
This patch adds the config directory to Cinder and in it
are two files:
-generate_cinder_opts.py that will take the
results of a grep command to create the opts.py
file to be passed into oslo-config-generator.
-cinder.conf which is the new configuration for
oslo-config-generator. The file is inside the config
directory to be consistent with other projects.
Some changes were made to the generate_sample.sh file in
order to give the base directories and target directories
to the generate_cinder_opts.py program.
tox.ini was edited to remove the checkonly option because
all that needs to happen in check_uptodate.sh is a check to
ensure that the cinder.conf.sample is actually being
generated with no issues.
All options were removed from the check_uptodate.sh
because they were unnecessary given the new, more simple
way of generating the cinder.conf.sample.
setup.cfg was also edited in order to add information
oslo-config-generator needs to run.
Co-Authored By: Jay Bryant <jsbryant@us.ibm.com>
Co-Authored By: Jacob Gregor <jgregor@us.ibm.com>
Change-Id: I643dbe5675ae9280e204f691781e617266f570d5
Closes-Bug: 1473768
Closes-Bug: 1437904
Closes-Bug: 1381563
99 lines
3.9 KiB
INI
99 lines
3.9 KiB
INI
[metadata]
|
|
name = cinder
|
|
version = 7.0.0
|
|
summary = OpenStack Block Storage
|
|
description-file =
|
|
README.rst
|
|
author = OpenStack
|
|
author-email = openstack-dev@lists.openstack.org
|
|
home-page = http://www.openstack.org/
|
|
classifier =
|
|
Environment :: OpenStack
|
|
Intended Audience :: Information Technology
|
|
Intended Audience :: System Administrators
|
|
License :: OSI Approved :: Apache Software License
|
|
Operating System :: POSIX :: Linux
|
|
Programming Language :: Python
|
|
Programming Language :: Python :: 2
|
|
Programming Language :: Python :: 2.7
|
|
|
|
[global]
|
|
setup-hooks =
|
|
pbr.hooks.setup_hook
|
|
|
|
[files]
|
|
packages =
|
|
cinder
|
|
|
|
[entry_points]
|
|
cinder.scheduler.filters =
|
|
AvailabilityZoneFilter = cinder.openstack.common.scheduler.filters.availability_zone_filter:AvailabilityZoneFilter
|
|
CapabilitiesFilter = cinder.openstack.common.scheduler.filters.capabilities_filter:CapabilitiesFilter
|
|
CapacityFilter = cinder.scheduler.filters.capacity_filter:CapacityFilter
|
|
DifferentBackendFilter = cinder.scheduler.filters.affinity_filter:DifferentBackendFilter
|
|
DriverFilter = cinder.scheduler.filters.driver_filter:DriverFilter
|
|
JsonFilter = cinder.openstack.common.scheduler.filters.json_filter:JsonFilter
|
|
RetryFilter = cinder.openstack.common.scheduler.filters.ignore_attempted_hosts_filter:IgnoreAttemptedHostsFilter
|
|
SameBackendFilter = cinder.scheduler.filters.affinity_filter:SameBackendFilter
|
|
InstanceLocalityFilter = cinder.scheduler.filters.instance_locality_filter:InstanceLocalityFilter
|
|
cinder.scheduler.weights =
|
|
AllocatedCapacityWeigher = cinder.scheduler.weights.capacity:AllocatedCapacityWeigher
|
|
CapacityWeigher = cinder.scheduler.weights.capacity:CapacityWeigher
|
|
ChanceWeigher = cinder.scheduler.weights.chance:ChanceWeigher
|
|
GoodnessWeigher = cinder.scheduler.weights.goodness:GoodnessWeigher
|
|
VolumeNumberWeigher = cinder.scheduler.weights.volume_number:VolumeNumberWeigher
|
|
oslo.config.opts =
|
|
cinder = cinder.opts:list_opts
|
|
keystonemiddleware = keystonemiddleware.auth_token:list_opts
|
|
oslo_concurrency = oslo_concurrency.opts:list_opts
|
|
oslo.messaging = oslo_messaging.opts:list_opts
|
|
oslo.db.concurrency = oslo.db.concurrency:list_opts
|
|
console_scripts =
|
|
cinder-all = cinder.cmd.all:main
|
|
cinder-api = cinder.cmd.api:main
|
|
cinder-backup = cinder.cmd.backup:main
|
|
cinder-manage = cinder.cmd.manage:main
|
|
cinder-rootwrap = oslo_rootwrap.cmd:main
|
|
cinder-rtstool = cinder.cmd.rtstool:main
|
|
cinder-scheduler = cinder.cmd.scheduler:main
|
|
cinder-volume = cinder.cmd.volume:main
|
|
cinder-volume-usage-audit = cinder.cmd.volume_usage_audit:main
|
|
# These are for backwards compat with Havana notification_driver configuration values
|
|
oslo_messaging.notify.drivers =
|
|
cinder.openstack.common.notifier.log_notifier = oslo_messaging.notify._impl_log:LogDriver
|
|
cinder.openstack.common.notifier.no_op_notifier = oslo_messaging.notify._impl_noop:NoOpDriver
|
|
cinder.openstack.common.notifier.rpc_notifier2 = oslo_messaging.notify._impl_messaging:MessagingV2Driver
|
|
cinder.openstack.common.notifier.rpc_notifier = oslo_messaging.notify._impl_messaging:MessagingDriver
|
|
cinder.openstack.common.notifier.test_notifier = oslo_messaging.notify._impl_test:TestDriver
|
|
# These are for backwards compatibility with Juno middleware configurations
|
|
oslo_middleware =
|
|
cinder.api.middleware.sizelimit = oslo_middleware.sizelimit
|
|
cinder.openstack.common.middleware.request_id = oslo_middleware.request_id
|
|
|
|
cinder.database.migration_backend =
|
|
sqlalchemy = oslo_db.sqlalchemy.migration
|
|
|
|
[build_sphinx]
|
|
all_files = 1
|
|
build-dir = doc/build
|
|
source-dir = doc/source
|
|
|
|
[egg_info]
|
|
tag_build =
|
|
tag_date = 0
|
|
tag_svn_revision = 0
|
|
|
|
[compile_catalog]
|
|
directory = cinder/locale
|
|
domain = cinder
|
|
|
|
[update_catalog]
|
|
domain = cinder
|
|
output_dir = cinder/locale
|
|
input_file = cinder/locale/cinder.pot
|
|
|
|
[extract_messages]
|
|
keywords = _ gettext ngettext l_ lazy_gettext
|
|
mapping_file = babel.cfg
|
|
output_file = cinder/locale/cinder.pot
|