From 91311d5c2c89aca666bb40dc04d917eea9266ed1 Mon Sep 17 00:00:00 2001 From: Rongze Zhu Date: Wed, 29 Aug 2012 09:46:32 +0000 Subject: [PATCH] Remove unused flags * region_list * aws_access_key_id * aws_secret_access_key * osapi_scheme * osapi_path * metadata_host * metadata_port * default_project * default_image * default_instance_type * vpn_image_id * vpn_key_suffix * auth_token_ttl * bandwith_poll_interval * start_guests_on_host_boot * resume_guests_state_on_host_boot * default_ephemeral_format * use_ipv6 * allow_resize_to_same_host * zombie_instance_updated_at_window * isolated_images * isolated_hosts Change-Id: Ia3d5ac7d7c983845b5411e2fc1f49eb579e3280f --- cinder/flags.py | 70 ----------------------------------- etc/cinder/cinder.conf.sample | 44 ---------------------- 2 files changed, 114 deletions(-) diff --git a/cinder/flags.py b/cinder/flags.py index 89b4bfa27..ef2e2ae0a 100644 --- a/cinder/flags.py +++ b/cinder/flags.py @@ -111,15 +111,6 @@ global_opts = [ cfg.StrOpt('my_ip', default=_get_my_ip(), help='ip address of this host'), - cfg.ListOpt('region_list', - default=[], - help='list of region=fqdn pairs separated by commas'), - cfg.StrOpt('aws_access_key_id', - default='admin', - help='AWS Access ID'), - cfg.StrOpt('aws_secret_access_key', - default='admin', - help='AWS Access Key'), cfg.StrOpt('glance_host', default='$my_ip', help='default glance hostname or ip'), @@ -152,13 +143,6 @@ global_opts = [ 'cinder.api.openstack.volume.contrib.standard_extensions' ], help='osapi volume extension to load'), - cfg.StrOpt('osapi_scheme', - default='http', - help='the protocol to use when connecting to the openstack api ' - 'server (http, https)'), - cfg.StrOpt('osapi_path', - default='/v1.1/', - help='the path prefix used to call the openstack api server'), cfg.StrOpt('osapi_compute_link_prefix', default=None, help='Base URL that will be presented to users in links ' @@ -167,34 +151,10 @@ global_opts = [ default=1000, help='the maximum number of items returned in a single ' 'response from a collection resource'), - cfg.StrOpt('metadata_host', - default='$my_ip', - help='the ip for the metadata api server'), - cfg.IntOpt('metadata_port', - default=8775, - help='the port for the metadata api port'), - cfg.StrOpt('default_project', - default='openstack', - help='the default project to use for openstack'), - cfg.StrOpt('default_image', - default='ami-11111', - help='default image to use, testing only'), - cfg.StrOpt('default_instance_type', - default='m1.small', - help='default instance type to use, testing only'), cfg.StrOpt('null_kernel', default='nokernel', help='kernel image that indicates not to use a kernel, but to ' 'use a raw disk image instead'), - cfg.StrOpt('vpn_image_id', - default='0', - help='image id used when starting up a cloudpipe vpn server'), - cfg.StrOpt('vpn_key_suffix', - default='-vpn', - help='Suffix to add to project name for vpn key and secgroups'), - cfg.IntOpt('auth_token_ttl', - default=3600, - help='Seconds for auth tokens to linger'), cfg.StrOpt('sqlite_db', default='cinder.sqlite', help='the filename to use with sqlite'), @@ -234,20 +194,6 @@ global_opts = [ default='month', help='time period to generate instance usages for. ' 'Time period must be hour, day, month or year'), - cfg.IntOpt('bandwith_poll_interval', - default=600, - help='interval to pull bandwidth usage info'), - cfg.BoolOpt('start_guests_on_host_boot', - default=False, - help='Whether to restart guests when the host reboots'), - cfg.BoolOpt('resume_guests_state_on_host_boot', - default=False, - help='Whether to start guests that were running before the ' - 'host rebooted'), - cfg.StrOpt('default_ephemeral_format', - default=None, - help='The default format a ephemeral_volume will be ' - 'formatted with on creation.'), cfg.StrOpt('root_helper', default='sudo', help='Deprecated: command to use for running commands as root'), @@ -255,37 +201,21 @@ global_opts = [ default=None, help='Path to the rootwrap configuration file to use for ' 'running commands as root'), - cfg.BoolOpt('use_ipv6', - default=False, - help='use ipv6'), cfg.BoolOpt('monkey_patch', default=False, help='Whether to log monkey patching'), cfg.ListOpt('monkey_patch_modules', default=[], help='List of modules/decorators to monkey patch'), - cfg.BoolOpt('allow_resize_to_same_host', - default=False, - help='Allow destination machine to match source for resize. ' - 'Useful when testing in single-host environments.'), cfg.IntOpt('reclaim_instance_interval', default=0, help='Interval in seconds for reclaiming deleted instances'), - cfg.IntOpt('zombie_instance_updated_at_window', - default=172800, - help='Number of seconds zombie instances are cleaned up.'), cfg.IntOpt('service_down_time', default=60, help='maximum time since last check-in for up service'), cfg.StrOpt('default_schedule_zone', default=None, help='availability zone to use when user doesn\'t specify one'), - cfg.ListOpt('isolated_images', - default=[], - help='Images to run on isolated host'), - cfg.ListOpt('isolated_hosts', - default=[], - help='Host reserved for specific images'), cfg.StrOpt('volume_api_class', default='cinder.volume.api.API', help='The full class name of the volume API class to use'), diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample index f01142e6d..d353cd7be 100644 --- a/etc/cinder/cinder.conf.sample +++ b/etc/cinder/cinder.conf.sample @@ -6,22 +6,12 @@ ######### defined in cinder.flags ######### -###### (BoolOpt) Allow destination machine to match source for resize. Useful when testing in single-host environments. -# allow_resize_to_same_host=false ###### (StrOpt) File name for the paste.deploy config for cinder-api # api_paste_config="api-paste.ini" ###### (BoolOpt) whether to rate limit the api # api_rate_limit=true ###### (StrOpt) The strategy to use for auth. Supports noauth, keystone, and deprecated. # auth_strategy="noauth" -###### (IntOpt) Seconds for auth tokens to linger -# auth_token_ttl=3600 -###### (StrOpt) AWS Access ID -# aws_access_key_id="admin" -###### (StrOpt) AWS Access Key -# aws_secret_access_key="admin" -###### (IntOpt) interval to pull bandwidth usage info -# bandwith_poll_interval=600 ###### (StrOpt) Directory where cinder binaries are installed # bindir="$pybasedir/bin" ###### (BoolOpt) Cache glance images locally @@ -41,14 +31,6 @@ # debug=false ###### (StrOpt) Name of network to use to set access ips for instances # default_access_ip_network_name= -###### (StrOpt) The default format a ephemeral_volume will be formatted with on creation. -# default_ephemeral_format= -###### (StrOpt) default image to use, testing only -# default_image="ami-11111" -###### (StrOpt) default instance type to use, testing only -# default_instance_type="m1.small" -###### (StrOpt) the default project to use for openstack -# default_project="openstack" ###### (StrOpt) availability zone to use when user doesn't specify one # default_schedule_zone= ###### (StrOpt) the internal ip of the ec2 api server @@ -89,10 +71,6 @@ # instance_dns_manager="cinder.network.dns_driver.DNSDriver" ###### (StrOpt) time period to generate instance usages for. Time period must be hour, day, month or year # instance_usage_audit_period="month" -###### (ListOpt) Host reserved for specific images -# isolated_hosts="" -###### (ListOpt) Images to run on isolated host -# isolated_images="" ###### (StrOpt) If this option is specified, the logging configuration file specified is used and overrides any other logging options specified. Please see the Python logging module documentation for details on logging configuration files. # log-config= ###### (StrOpt) Format string for %(asctime)s in log records. Default: %default @@ -111,10 +89,6 @@ # logfile_mode="0644" ###### (ListOpt) Memcached servers or None for in process cache. # memcached_servers= -###### (StrOpt) the ip for the metadata api server -# metadata_host="$my_ip" -###### (IntOpt) the port for the metadata api port -# metadata_port=8775 ###### (BoolOpt) Whether to log monkey patching # monkey_patch=false ###### (ListOpt) List of modules/decorators to monkey patch @@ -137,10 +111,6 @@ # osapi_glance_link_prefix= ###### (IntOpt) the maximum number of items returned in a single response from a collection resource # osapi_max_limit=1000 -###### (StrOpt) the path prefix used to call the openstack api server -# osapi_path="/v1.1/" -###### (StrOpt) the protocol to use when connecting to the openstack api server (http, https) -# osapi_scheme="http" ###### (ListOpt) Specify list of extensions to load when using osapi_volume_extension option with cinder.api.openstack.volume.contrib.select_extensions # osapi_volume_ext_list="" ###### (MultiStrOpt) osapi volume extension to load @@ -171,10 +141,6 @@ # rabbit_virtual_host="/" ###### (IntOpt) Interval in seconds for reclaiming deleted instances # reclaim_instance_interval=0 -###### (ListOpt) list of region=fqdn pairs separated by commas -# region_list="" -###### (BoolOpt) Whether to start guests that were running before the host rebooted -# resume_guests_state_on_host_boot=false ###### (StrOpt) Command prefix to use for running commands as root # root_helper="sudo" ###### (StrOpt) hostname or ip for the instances to use when accessing the s3 api @@ -203,8 +169,6 @@ # sqlite_db="cinder.sqlite" ###### (BoolOpt) If passed, use synchronous mode for sqlite # sqlite_synchronous=true -###### (BoolOpt) Whether to restart guests when the host reboots -# start_guests_on_host_boot=false ###### (StrOpt) Top-level directory for maintaining cinder's state # state_path="$pybasedir" ###### (StrOpt) Stub network related code @@ -213,8 +177,6 @@ # syslog-log-facility="LOG_USER" ###### (BoolOpt) Whether to use cow images # use_cow_images=true -###### (BoolOpt) use ipv6 -# use_ipv6=false ###### (BoolOpt) Log output to standard error # use_stderr=true ###### (BoolOpt) Use syslog for logging. @@ -227,12 +189,6 @@ # volume_manager="cinder.volume.manager.VolumeManager" ###### (StrOpt) the topic volume nodes listen on # volume_topic="volume" -###### (StrOpt) image id used when starting up a cloudpipe vpn server -# vpn_image_id="0" -###### (StrOpt) Suffix to add to project name for vpn key and secgroups -# vpn_key_suffix="-vpn" -###### (IntOpt) Number of seconds zombie instances are cleaned up. -# zombie_instance_updated_at_window=172800 ######### defined in cinder.log ######### -- 2.45.2