e9515ba745
This can be used to formalize deprecation timelines, so that options
are removed when planned. This includes moving some lines around, so
that parameters are in a regular order. A future change can remove the
fully deprecated options.
The relevant commits are:
DEFAULT vendordata_driver 21da1ba
cells manager 0fcec69
cells driver 579c98a
conductor use_local a698871
conductor manager e683c41
service metadata_manager 0fcec69
service compute_manager 0fcec69
service console_manager 0fcec69
service consoleauth_manager 0fcec69
service cert_manager 0fcec69
service scheduler_manager 0fcec69
DEFAULT quota_driver 4306388
DEFAULT compute_available_monitors 973f312
DEFAULT compute_stats_class 3be36fc
DEFAULT snapshot_name_template aeee454
DEFAULT db_driver c87ae92
DEFAULT image_decryption_dir be86b27
DEFAULT s3_host be86b27
DEFAULT s3_port be86b27
DEFAULT s3_access_key be86b27
DEFAULT s3_secret_key be86b27
DEFAULT s3_use_ssl be86b27
DEFAULT s3_affix_tenant be86b27
DEFAULT enable_network_quota d0b8fec
DEFAULT quota_networks d0b8fec
glance use_glance_v1 16dd86f
image_file_url filesystems 9931ef9
image_file_url:??? id 9931ef9
image_file_url:??? mountpoint 9931ef9
DEFAULT fatal_exception_format_errors 6919b25
barbican catalog_info 899a140
barbican endpoint_template 899a140
barbican os_region_name 899a140
ironic admin_username 2ea2399
ironic admin_password 2ea2399
libvirt use_usb_tablet 73d5d1f
libvirt image_info_filename_pattern 2c389cc
libvirt checksum_base_images 2c389cc
libvirt checksum_interval_seconds 2c389cc
DEFAULT share_dhcp_address e29a800
DEFAULT security_group_api ef957ee
osapi_v21 extensions_blacklist 11507ee
osapi_v21 extensions_whitelist 11507ee
osapi_v21 project_id_regex 1f16a76
DEFAULT cert_topic 5afc8e5
DEFAULT default_flavor b7660e0
Change-Id: I9e483109b52fe6d98e386a03010063cb37a0d9c8
Implements: bp centralize-config-options-ocata
81 lines
3.0 KiB
Python
81 lines
3.0 KiB
Python
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# Copyright 2016 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# 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 oslo_config import cfg
|
|
|
|
s3_opts = [
|
|
cfg.StrOpt('image_decryption_dir',
|
|
deprecated_for_removal=True,
|
|
deprecated_since='14.0.0',
|
|
deprecated_reason='EC2 API related options are not supported.',
|
|
default='/tmp',
|
|
help="""
|
|
Parent directory for tempdir used for image decryption
|
|
"""),
|
|
cfg.StrOpt('s3_host',
|
|
deprecated_for_removal=True,
|
|
deprecated_since='14.0.0',
|
|
deprecated_reason='EC2 API related options are not supported.',
|
|
default='$my_ip',
|
|
help="""
|
|
Hostname or IP for OpenStack to use when accessing the S3 API
|
|
"""),
|
|
cfg.PortOpt('s3_port',
|
|
deprecated_for_removal=True,
|
|
deprecated_since='14.0.0',
|
|
deprecated_reason='EC2 API related options are not supported.',
|
|
default=3333,
|
|
help="""
|
|
Port used when accessing the S3 API. It should be in the range of
|
|
1 - 65535
|
|
"""),
|
|
cfg.StrOpt('s3_access_key',
|
|
deprecated_for_removal=True,
|
|
deprecated_since='14.0.0',
|
|
deprecated_reason='EC2 API related options are not supported.',
|
|
default='notchecked',
|
|
help='Access key to use S3 server for images'),
|
|
cfg.StrOpt('s3_secret_key',
|
|
deprecated_for_removal=True,
|
|
deprecated_since='14.0.0',
|
|
deprecated_reason='EC2 API related options are not supported.',
|
|
default='notchecked',
|
|
help='Secret key to use for S3 server for images'),
|
|
cfg.BoolOpt('s3_use_ssl',
|
|
deprecated_for_removal=True,
|
|
deprecated_since='14.0.0',
|
|
deprecated_reason='EC2 API related options are not supported.',
|
|
default=False,
|
|
help='Whether to use SSL when talking to S3'),
|
|
cfg.BoolOpt('s3_affix_tenant',
|
|
deprecated_for_removal=True,
|
|
deprecated_since='14.0.0',
|
|
deprecated_reason='EC2 API related options are not supported.',
|
|
default=False,
|
|
help="""
|
|
Whether to affix the tenant id to the access key when downloading from S3
|
|
"""),
|
|
]
|
|
|
|
|
|
def register_opts(conf):
|
|
conf.register_opts(s3_opts)
|
|
|
|
|
|
def list_opts():
|
|
return {'DEFAULT': s3_opts}
|