openstack
/
nova
Code Issues Proposed changes

maint: remove redundant default=None for config options 

These 73 instances were inconsistent and redundant.

Change-Id: I298f2406535d0805caebdca4f2729d720dd5222f
This commit is contained in:
Pádraig Brady 2013-08-09 01:56:42 +01:00
parent a943f1403f
commit 9304aabeb8
42 changed files with 1 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova/api/metadata/vendordata_json.py
View File

@ -27,7 +27,6 @@ from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging
file_opt = cfg.StrOpt('vendordata_jsonfile_path',
default=None,
help='File to load json formated vendor data from')
CONF = cfg.CONF

2
nova/api/openstack/common.py
View File

@ -40,11 +40,9 @@ osapi_opts = [
help='the maximum number of items returned in a single '
'response from a collection resource'),
cfg.StrOpt('osapi_compute_link_prefix',
default=None,
help='Base URL that will be presented to users in links '
'to the OpenStack Compute API'),
cfg.StrOpt('osapi_glance_link_prefix',
default=None,
help='Base URL that will be presented to users in links '
'to glance resources'),
]

1
nova/baserpc.py
View File

@ -27,7 +27,6 @@ import nova.openstack.common.rpc.proxy as rpc_proxy
CONF = cfg.CONF
rpcapi_cap_opt = cfg.StrOpt('baseapi',
default=None,
help='Set a version cap for messages sent to the base api in any '
'service')
CONF.register_opt(rpcapi_cap_opt, 'upgrade_levels')

1
nova/cells/opts.py
View File

@ -49,7 +49,6 @@ cells_opts = [
help='Percentage of cell capacity to hold in reserve. '
'Affects both memory and disk utilization'),
cfg.StrOpt('cell_type',
default=None,
help='Type of cell: api or compute'),
cfg.IntOpt("mute_child_interval",
default=300,

1
nova/cells/rpc_driver.py
View File

@ -40,7 +40,6 @@ CONF.import_opt('call_timeout', 'nova.cells.opts', group='cells')
CONF.import_opt('rpc_backend', 'nova.openstack.common.rpc')
rpcapi_cap_opt = cfg.StrOpt('intercell',
default=None,
help='Set a version cap for messages sent between cells services')
CONF.register_opt(rpcapi_cap_opt, 'upgrade_levels')

1
nova/cells/rpcapi.py
View File

@ -38,7 +38,6 @@ CONF.import_opt('enable', 'nova.cells.opts', group='cells')
CONF.import_opt('topic', 'nova.cells.opts', group='cells')
rpcapi_cap_opt = cfg.StrOpt('cells',
default=None,
help='Set a version cap for messages sent to local cells services')
CONF.register_opt(rpcapi_cap_opt, 'upgrade_levels')

1
nova/cells/state.py
View File

@ -38,7 +38,6 @@ cell_state_manager_opts = [
default=60,
help='Seconds between getting fresh cell info from db.'),
cfg.StrOpt('cells_config',
default=None,
help='Configuration file from which to read cells '
'configuration. If given, overrides reading cells '
'from the database.'),

1
nova/cert/rpcapi.py
View File

@ -32,7 +32,6 @@ CONF = cfg.CONF
CONF.register_opts(rpcapi_opts)
rpcapi_cap_opt = cfg.StrOpt('cert',
default=None,
help='Set a version cap for messages sent to cert services')
CONF.register_opt(rpcapi_cap_opt, 'upgrade_levels')

1
nova/cmd/novnc.py
View File

@ -34,7 +34,6 @@ opts = [
default='self.pem',
help='SSL certificate file'),
cfg.StrOpt('key',
default=None,
help='SSL key file (if separate from cert)'),
cfg.StrOpt('web',
default='/usr/share/spice-html5',

1
nova/compute/api.py
View File

@ -84,7 +84,6 @@ compute_opts = [
help='Allow migrate machine to the same host. '
'Useful when testing in single-host environments.'),
cfg.StrOpt('default_schedule_zone',
default=None,
help='availability zone to use when user doesn\'t specify one'),
cfg.ListOpt('non_inheritable_image_properties',
default=['cache_in_nova',

1
nova/compute/manager.py
View File

@ -89,7 +89,6 @@ compute_opts = [
help='Console proxy host to use to connect '
'to instances on this host.'),
cfg.StrOpt('default_access_ip_network_name',
default=None,
help='Name of network to use to set access ips for instances'),
cfg.BoolOpt('defer_iptables_apply',
default=False,

1
nova/compute/rpcapi.py
View File

@ -38,7 +38,6 @@ CONF = cfg.CONF
CONF.register_opts(rpcapi_opts)
rpcapi_cap_opt = cfg.StrOpt('compute',
default=None,
help='Set a version cap for messages sent to compute services')
CONF.register_opt(rpcapi_cap_opt, 'upgrade_levels')

1
nova/conductor/rpcapi.py
View File

@ -24,7 +24,6 @@ import nova.openstack.common.rpc.proxy
CONF = cfg.CONF
rpcapi_cap_opt = cfg.StrOpt('conductor',
default=None,
help='Set a version cap for messages sent to conductor services')
CONF.register_opt(rpcapi_cap_opt, 'upgrade_levels')

1
nova/console/rpcapi.py
View File

@ -32,7 +32,6 @@ CONF = cfg.CONF
CONF.register_opts(rpcapi_opts)
rpcapi_cap_opt = cfg.StrOpt('console',
default=None,
help='Set a version cap for messages sent to console services')
CONF.register_opt(rpcapi_cap_opt, 'upgrade_levels')

1
nova/consoleauth/rpcapi.py
View File

@ -25,7 +25,6 @@ import nova.openstack.common.rpc.proxy
CONF = cfg.CONF
rpcapi_cap_opt = cfg.StrOpt('consoleauth',
default=None,
help='Set a version cap for messages sent to consoleauth services')
CONF.register_opt(rpcapi_cap_opt, 'upgrade_levels')

1
nova/network/linux_net.py
View File

@ -54,7 +54,6 @@ linux_net_opts = [
default='eth0',
help='Interface for public IP addresses'),
cfg.StrOpt('network_device_mtu',
default=None,
help='MTU setting for vlan'),
cfg.StrOpt('dhcpbridge',
default=paths.bindir_def('nova-dhcpbridge'),

5
nova/network/manager.py
View File

@ -84,7 +84,6 @@ QUOTAS = quota.QUOTAS
network_opts = [
cfg.StrOpt('flat_network_bridge',
default=None,
help='Bridge for simple network instances'),
cfg.StrOpt('flat_network_dns',
default='8.8.4.4',
@ -93,13 +92,11 @@ network_opts = [
default=False,
help='Whether to attempt to inject network setup into guest'),
cfg.StrOpt('flat_interface',
default=None,
help='FlatDhcp will bridge into this interface if set'),
cfg.IntOpt('vlan_start',
default=100,
help='First VLAN for private networks'),
cfg.StrOpt('vlan_interface',
default=None,
help='vlans will bridge into this interface if set'),
cfg.IntOpt('num_networks',
default=1,
@ -123,10 +120,8 @@ network_opts = [
default='fd00::/48',
help='Fixed IPv6 address block'),
cfg.StrOpt('gateway',
default=None,
help='Default IPv4 gateway'),
cfg.StrOpt('gateway_v6',
default=None,
help='Default IPv6 gateway'),
cfg.IntOpt('cnt_vpn_clients',
default=0,

1
nova/network/neutronv2/api.py
View File

@ -83,7 +83,6 @@ neutron_opts = [
help='Number of seconds before querying neutron for'
' extensions'),
cfg.StrOpt('neutron_ca_certificates_file',
default=None,
help='Location of ca certicates file to use for neutronclient'
' requests.'),
]

1
nova/network/rpcapi.py
View File

@ -38,7 +38,6 @@ CONF = cfg.CONF
CONF.register_opts(rpcapi_opts)
rpcapi_cap_opt = cfg.StrOpt('network',
default=None,
help='Set a version cap for messages sent to network services')
CONF.register_opt(rpcapi_cap_opt, 'upgrade_levels')

2
nova/notifications.py
View File

@ -39,7 +39,7 @@ from nova import utils
LOG = log.getLogger(__name__)
notify_opts = [
cfg.StrOpt('notify_on_state_change', default=None,
cfg.StrOpt('notify_on_state_change',
help='If set, send compute.instance.update notifications on instance '
'state changes. Valid values are None for no notifications, '
'"vm_state" for notifications on VM state changes, or '

3
nova/scheduler/filters/trusted_filter.py
View File

@ -62,10 +62,8 @@ LOG = logging.getLogger(__name__)
trusted_opts = [
cfg.StrOpt('attestation_server',
default=None,
help='attestation server http'),
cfg.StrOpt('attestation_server_ca_file',
default=None,
help='attestation server Cert file for Identity verification'),
cfg.StrOpt('attestation_port',
default='8443',
@ -74,7 +72,6 @@ trusted_opts = [
default='/OpenAttestationWebServices/V1.0',
help='attestation web API URL'),
cfg.StrOpt('attestation_auth_blob',
default=None,
help='attestation authorization blob - must change'),
cfg.IntOpt('attestation_auth_timeout',
default=60,

1
nova/scheduler/rpcapi.py
View File

@ -33,7 +33,6 @@ CONF = cfg.CONF
CONF.register_opts(rpcapi_opts)
rpcapi_cap_opt = cfg.StrOpt('scheduler',
default=None,
help='Set a version cap for messages sent to scheduler services')
CONF.register_opt(rpcapi_cap_opt, 'upgrade_levels')

3
nova/service.py
View File

@ -65,7 +65,6 @@ service_opts = [
default=8773,
help='port for ec2 api to listen'),
cfg.IntOpt('ec2_workers',
default=None,
help='Number of workers for EC2 API service'),
cfg.StrOpt('osapi_compute_listen',
default="0.0.0.0",
@ -74,7 +73,6 @@ service_opts = [
default=8774,
help='list port for osapi compute'),
cfg.IntOpt('osapi_compute_workers',
default=None,
help='Number of workers for OpenStack API service'),
cfg.StrOpt('metadata_manager',
default='nova.api.manager.MetadataManager',
@ -86,7 +84,6 @@ service_opts = [
default=8775,
help='port for metadata api to listen'),
cfg.IntOpt('metadata_workers',
default=None,
help='Number of workers for metadata service'),
cfg.StrOpt('compute_manager',
default='nova.compute.manager.ComputeManager',

1
nova/servicegroup/drivers/zk.py
View File

@ -32,7 +32,6 @@ zookeeper = importutils.try_import('zookeeper')
zk_driver_opts = [
cfg.StrOpt('address',
default=None,
help='The ZooKeeper addresses for servicegroup service in the '
'format of host1:port,host2:port,host3:port'),
cfg.IntOpt('recv_timeout',

1
nova/utils.py
View File

@ -77,7 +77,6 @@ utils_opts = [
help='Path to the rootwrap configuration file to use for '
'running commands as root'),
cfg.StrOpt('tempdir',
default=None,
help='Explicitly specify the temporary working directory'),
]
CONF = cfg.CONF

1
nova/virt/baremetal/ipmi.py
View File

@ -42,7 +42,6 @@ opts = [
default='shellinaboxd',
help='path to baremetal terminal program'),
cfg.StrOpt('terminal_cert_dir',
default=None,
help='path to baremetal terminal SSL cert(PEM)'),
cfg.StrOpt('terminal_pid_dir',
default=paths.state_path_def('baremetal/console'),

1
nova/virt/baremetal/virtual_power_driver.py
View File

@ -47,7 +47,6 @@ opts = [
default='',
help='password for virtual power host_user'),
cfg.StrOpt('virtual_power_host_key',
default=None,
help='ssh key for virtual power host_user'),
]

1
nova/virt/configdrive.py
View File

@ -43,7 +43,6 @@ configdrive_opts = [
# force_config_drive is a string option, to allow for future behaviors
# (e.g. use config_drive based on image properties)
cfg.StrOpt('force_config_drive',
default=None,
help='Set to force injection to take place on a config drive '
'(if set, valid options are: always)'),
cfg.StrOpt('mkisofs_cmd',

1
nova/virt/driver.py
View File

@ -39,7 +39,6 @@ driver_opts = [
'fake.FakeDriver, baremetal.BareMetalDriver, '
'vmwareapi.VMwareESXDriver, vmwareapi.VMwareVCDriver'),
cfg.StrOpt('default_ephemeral_format',
default=None,
help='The default format an ephemeral_volume will be '
'formatted with on creation.'),
cfg.StrOpt('preallocate_images',

1
nova/virt/firewall.py
View File

@ -32,7 +32,6 @@ LOG = logging.getLogger(__name__)
firewall_opts = [
cfg.StrOpt('firewall_driver',
default=None,
help='Firewall driver '
'(defaults to hypervisor specific iptables driver)'),
cfg.BoolOpt('allow_same_net_traffic',

1
nova/virt/hyperv/vif.py
View File

@ -27,7 +27,6 @@ from nova.virt.hyperv import vmutils
hyperv_opts = [
cfg.StrOpt('vswitch_name',
default=None,
help='External virtual switch Name, '
'if not provided, the first external virtual '
'switch is used'),

8
nova/virt/libvirt/driver.py
View File

@ -105,13 +105,10 @@ LOG = logging.getLogger(__name__)
libvirt_opts = [
cfg.StrOpt('rescue_image_id',
default=None,
help='Rescue ami image'),
cfg.StrOpt('rescue_kernel_id',
default=None,
help='Rescue aki image'),
cfg.StrOpt('rescue_ramdisk_id',
default=None,
help='Rescue ari image'),
cfg.StrOpt('libvirt_type',
default='kvm',
@ -152,7 +149,6 @@ libvirt_opts = [
default=0,
help='Maximum bandwidth to be used during migration, in Mbps'),
cfg.StrOpt('snapshot_image_format',
default=None,
help='Snapshot image format (valid options are : '
'raw, qcow2, vmdk, vdi). '
'Defaults to same as source image'),
@ -177,7 +173,6 @@ libvirt_opts = [
],
help='Libvirt handlers for remote volumes.'),
cfg.StrOpt('libvirt_disk_prefix',
default=None,
help='Override the default disk prefix for the devices attached'
' to a server, which is dependent on libvirt_type. '
'(valid options are: sd, xvd, uvd, vd)'),
@ -191,7 +186,6 @@ libvirt_opts = [
help='Use a separated OS thread pool to realize non-blocking'
' libvirt calls'),
cfg.StrOpt('libvirt_cpu_mode',
default=None,
help='Set to "host-model" to clone the host CPU feature flags; '
'to "host-passthrough" to use the host CPU model exactly; '
'to "custom" to use a named CPU model; '
@ -199,7 +193,6 @@ libvirt_opts = [
'If libvirt_type="kvm|qemu", it will default to '
'"host-model", otherwise it will default to "none"'),
cfg.StrOpt('libvirt_cpu_model',
default=None,
help='Set to a named libvirt CPU model (see names listed '
'in /usr/share/libvirt/cpu_map.xml). Only has effect if '
'libvirt_cpu_mode="custom" and libvirt_type="kvm|qemu"'),
@ -215,7 +208,6 @@ libvirt_opts = [
help='Specific cachemodes to use for different disk types '
'e.g: ["file=directsync","block=none"]'),
cfg.StrOpt('vcpu_pin_set',
default=None,
help='Which pcpus can be used by vcpus of instance '
'e.g: "4-12,^8,15"'),
]

1
nova/virt/libvirt/imagebackend.py
View File

@ -39,7 +39,6 @@ __imagebackend_opts = [
' default. If default is specified,'
' then use_cow_images flag is used instead of this one.'),
cfg.StrOpt('libvirt_images_volume_group',
default=None,
help='LVM Volume Group that is used for VM images, when you'
' specify libvirt_images_type=lvm.'),
cfg.BoolOpt('libvirt_sparse_logical_volumes',

4
nova/virt/libvirt/volume.py
View File

@ -44,17 +44,14 @@ volume_opts = [
default=3,
help='number of times to rescan iSCSI target to find volume'),
cfg.StrOpt('rbd_user',
default=None,
help='the RADOS client name for accessing rbd volumes'),
cfg.StrOpt('rbd_secret_uuid',
default=None,
help='the libvirt uuid of the secret for the rbd_user'
'volumes'),
cfg.StrOpt('nfs_mount_point_base',
default=paths.state_path_def('mnt'),
help='Dir where the nfs volume is mounted on the compute node'),
cfg.StrOpt('nfs_mount_options',
default=None,
help='Mount options passed to the nfs client. See section '
'of the nfs man page for details'),
cfg.IntOpt('num_aoe_discover_tries',
@ -68,7 +65,6 @@ volume_opts = [
default=False,
help='use multipath connection of the iSCSI volume'),
cfg.StrOpt('scality_sofs_config',
default=None,
help='Path or URL to Scality SOFS configuration file'),
cfg.StrOpt('scality_sofs_mount_point',
default='$state_path/scality',

3
nova/virt/powervm/driver.py
View File

@ -34,13 +34,10 @@ powervm_opts = [
default='ivm',
help='PowerVM manager type (ivm, hmc)'),
cfg.StrOpt('powervm_mgr',
default=None,
help='PowerVM manager host or ip'),
cfg.StrOpt('powervm_mgr_user',
default=None,
help='PowerVM manager user name'),
cfg.StrOpt('powervm_mgr_passwd',
default=None,
help='PowerVM manager user password',
secret=True),
cfg.StrOpt('powervm_img_remote_path',

5
nova/virt/vmwareapi/driver.py
View File

@ -62,21 +62,18 @@ LOG = logging.getLogger(__name__)
vmwareapi_opts = [
cfg.StrOpt('host_ip',
default=None,
deprecated_name='vmwareapi_host_ip',
deprecated_group='DEFAULT',
help='URL for connection to VMware ESX/VC host. Required if '
'compute_driver is vmwareapi.VMwareESXDriver or '
'vmwareapi.VMwareVCDriver.'),
cfg.StrOpt('host_username',
default=None,
deprecated_name='vmwareapi_host_username',
deprecated_group='DEFAULT',
help='Username for connection to VMware ESX/VC host. '
'Used only if compute_driver is '
'vmwareapi.VMwareESXDriver or vmwareapi.VMwareVCDriver.'),
cfg.StrOpt('host_password',
default=None,
deprecated_name='vmwareapi_host_password',
deprecated_group='DEFAULT',
help='Password for connection to VMware ESX/VC host. '
@ -84,7 +81,6 @@ vmwareapi_opts = [
'vmwareapi.VMwareESXDriver or vmwareapi.VMwareVCDriver.',
secret=True),
cfg.StrOpt('cluster_name',
default=None,
deprecated_name='vmwareapi_cluster_name',
deprecated_group='DEFAULT',
help='Name of a VMware Cluster ComputeResource. '
@ -117,7 +113,6 @@ vmwareapi_opts = [
deprecated_group='DEFAULT',
help='Total number of VNC ports'),
cfg.StrOpt('vnc_password',
default=None,
deprecated_name='vnc_password',
deprecated_group='DEFAULT',
help='VNC password',

1
nova/virt/vmwareapi/vim.py
View File

@ -37,7 +37,6 @@ CONN_ABORT_ERROR = 'Software caused connection abort'
ADDRESS_IN_USE_ERROR = 'Address already in use'
vmwareapi_wsdl_loc_opt = cfg.StrOpt('wsdl_location',
default=None,
deprecated_name='vmwareapi_wsdl_loc',
deprecated_group='DEFAULT',
help='Optional VIM Service WSDL Location '

3
nova/virt/xenapi/driver.py
View File

@ -64,7 +64,6 @@ LOG = logging.getLogger(__name__)
xenapi_opts = [
cfg.StrOpt('xenapi_connection_url',
default=None,
help='URL for connection to XenServer/Xen Cloud Platform. '
'Required if compute_driver=xenapi.XenAPIDriver'),
cfg.StrOpt('xenapi_connection_username',
@ -72,7 +71,6 @@ xenapi_opts = [
help='Username for connection to XenServer/Xen Cloud Platform. '
'Used only if compute_driver=xenapi.XenAPIDriver'),
cfg.StrOpt('xenapi_connection_password',
default=None,
help='Password for connection to XenServer/Xen Cloud Platform. '
'Used only if compute_driver=xenapi.XenAPIDriver',
secret=True),
@ -96,7 +94,6 @@ xenapi_opts = [
default='/var/run/sr-mount',
help='Base path to the storage repository'),
cfg.StrOpt('target_host',
default=None,
help='iSCSI Target Host'),
cfg.StrOpt('target_port',
default='3260',

1
nova/virt/xenapi/image/bittorrent.py
View File

@ -26,7 +26,6 @@ LOG = logging.getLogger(__name__)
xenapi_torrent_opts = [
cfg.StrOpt('xenapi_torrent_base_url',
default=None,
help='Base URL for torrent files.'),
cfg.FloatOpt('xenapi_torrent_seed_chance',
default=1.0,

3
nova/volume/cinder.py
View File

@ -40,14 +40,11 @@ cinder_opts = [
'catalog. Format is : separated values of the form: '
'<service_type>:<service_name>:<endpoint_type>'),
cfg.StrOpt('cinder_endpoint_template',
default=None,
help='Override service catalog lookup with template for cinder '
'endpoint e.g. http://localhost:8776/v1/%(project_id)s'),
cfg.StrOpt('os_region_name',
default=None,
help='region name of this node'),
cfg.StrOpt('cinder_ca_certificates_file',
default=None,
help='Location of ca certicates file to use for cinder client '
'requests.'),
cfg.IntOpt('cinder_http_retries',

3
nova/wsgi.py
View File

@ -55,14 +55,11 @@ wsgi_opts = [
'into it: client_ip, date_time, request_line, status_code, '
'body_length, wall_seconds.'),
cfg.StrOpt('ssl_ca_file',
default=None,
help="CA certificate file to use to verify "
"connecting clients"),
cfg.StrOpt('ssl_cert_file',
default=None,
help="SSL certificate of API server"),
cfg.StrOpt('ssl_key_file',
default=None,
help="SSL private key of API server"),
cfg.IntOpt('tcp_keepidle',
default=600,

1
tools/xenserver/vm_vdi_cleaner.py
View File

@ -43,7 +43,6 @@ cleaner_opts = [
]
cli_opt = cfg.StrOpt('command',
default=None,
help='Cleaner command')
CONF = cfg.CONF