diff options
42 files changed, 1 insertions, 73 deletions
diff --git a/nova/api/metadata/vendordata_json.py b/nova/api/metadata/vendordata_json.py index fb5d36626c..2d44cfd842 100644 --- a/nova/api/metadata/vendordata_json.py +++ b/nova/api/metadata/vendordata_json.py @@ -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 diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py index def0fbee02..544758f7db 100644 --- a/nova/api/openstack/common.py +++ b/nova/api/openstack/common.py @@ -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'), ] diff --git a/nova/baserpc.py b/nova/baserpc.py index b166cb4003..2c161d7023 100644 --- a/nova/baserpc.py +++ b/nova/baserpc.py @@ -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') diff --git a/nova/cells/opts.py b/nova/cells/opts.py index 2b95a90e83..9c1ef8f385 100644 --- a/nova/cells/opts.py +++ b/nova/cells/opts.py @@ -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, diff --git a/nova/cells/rpc_driver.py b/nova/cells/rpc_driver.py index 4116ceda8b..ae94d4ff71 100644 --- a/nova/cells/rpc_driver.py +++ b/nova/cells/rpc_driver.py @@ -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') diff --git a/nova/cells/rpcapi.py b/nova/cells/rpcapi.py index 6f61c96809..319b7877b7 100644 --- a/nova/cells/rpcapi.py +++ b/nova/cells/rpcapi.py @@ -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') diff --git a/nova/cells/state.py b/nova/cells/state.py index fa10001028..21a2705b7d 100644 --- a/nova/cells/state.py +++ b/nova/cells/state.py @@ -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.'), diff --git a/nova/cert/rpcapi.py b/nova/cert/rpcapi.py index f4311b517b..10ca89d8e2 100644 --- a/nova/cert/rpcapi.py +++ b/nova/cert/rpcapi.py @@ -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') diff --git a/nova/cmd/novnc.py b/nova/cmd/novnc.py index c381984dab..3397bb8163 100644 --- a/nova/cmd/novnc.py +++ b/nova/cmd/novnc.py @@ -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', diff --git a/nova/compute/api.py b/nova/compute/api.py index e69aa005b0..9afaa1fe0d 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -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', diff --git a/nova/compute/manager.py b/nova/compute/manager.py index a38a3cba42..225d8ae9a4 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -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, diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index 266553a3ce..8c03e199cc 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -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') diff --git a/nova/conductor/rpcapi.py b/nova/conductor/rpcapi.py index be2ff6eae8..d95ed4ac4e 100644 --- a/nova/conductor/rpcapi.py +++ b/nova/conductor/rpcapi.py @@ -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') diff --git a/nova/console/rpcapi.py b/nova/console/rpcapi.py index 7a78b52c22..9b463522c7 100644 --- a/nova/console/rpcapi.py +++ b/nova/console/rpcapi.py @@ -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') diff --git a/nova/consoleauth/rpcapi.py b/nova/consoleauth/rpcapi.py index ffc1a3de4e..d0faa9c76e 100644 --- a/nova/consoleauth/rpcapi.py +++ b/nova/consoleauth/rpcapi.py @@ -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') diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 4f8efa9986..8e5dec4aff 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -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'), diff --git a/nova/network/manager.py b/nova/network/manager.py index 9769798b4c..1e782c5fb6 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -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, diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py index 34c8735f97..d31f10f54b 100644 --- a/nova/network/neutronv2/api.py +++ b/nova/network/neutronv2/api.py @@ -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.'), ] diff --git a/nova/network/rpcapi.py b/nova/network/rpcapi.py index b36bdd119c..86e386e072 100644 --- a/nova/network/rpcapi.py +++ b/nova/network/rpcapi.py @@ -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') diff --git a/nova/notifications.py b/nova/notifications.py index 8331cc3760..26e5dcccbf 100644 --- a/nova/notifications.py +++ b/nova/notifications.py @@ -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 ' diff --git a/nova/scheduler/filters/trusted_filter.py b/nova/scheduler/filters/trusted_filter.py index d5cf9678cd..a49b33101d 100644 --- a/nova/scheduler/filters/trusted_filter.py +++ b/nova/scheduler/filters/trusted_filter.py @@ -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, diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index 9cd7a28b68..23343b1a78 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -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') diff --git a/nova/service.py b/nova/service.py index bf54a972d1..65c08284ee 100644 --- a/nova/service.py +++ b/nova/service.py @@ -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', diff --git a/nova/servicegroup/drivers/zk.py b/nova/servicegroup/drivers/zk.py index 6c4e2da9b8..faf057a90b 100644 --- a/nova/servicegroup/drivers/zk.py +++ b/nova/servicegroup/drivers/zk.py @@ -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', diff --git a/nova/utils.py b/nova/utils.py index cab29b3f70..19f32c675c 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -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 diff --git a/nova/virt/baremetal/ipmi.py b/nova/virt/baremetal/ipmi.py index ffadf4f4d6..49bcfcc98c 100644 --- a/nova/virt/baremetal/ipmi.py +++ b/nova/virt/baremetal/ipmi.py @@ -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'), diff --git a/nova/virt/baremetal/virtual_power_driver.py b/nova/virt/baremetal/virtual_power_driver.py index 3239c41d78..6451ff9e18 100644 --- a/nova/virt/baremetal/virtual_power_driver.py +++ b/nova/virt/baremetal/virtual_power_driver.py @@ -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'), ] diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py index 56b425cce0..3c3e430732 100644 --- a/nova/virt/configdrive.py +++ b/nova/virt/configdrive.py @@ -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', diff --git a/nova/virt/driver.py b/nova/virt/driver.py index 144b7b12e4..ce8e50f859 100755 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -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', diff --git a/nova/virt/firewall.py b/nova/virt/firewall.py index 852d7eeacd..1fd610e362 100644 --- a/nova/virt/firewall.py +++ b/nova/virt/firewall.py @@ -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', diff --git a/nova/virt/hyperv/vif.py b/nova/virt/hyperv/vif.py index e70e3f8666..428531f019 100644 --- a/nova/virt/hyperv/vif.py +++ b/nova/virt/hyperv/vif.py @@ -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'), diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 77bf3d9532..098fbe3030 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -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"'), ] diff --git a/nova/virt/libvirt/imagebackend.py b/nova/virt/libvirt/imagebackend.py index 0609639547..7b9b3913e9 100755 --- a/nova/virt/libvirt/imagebackend.py +++ b/nova/virt/libvirt/imagebackend.py @@ -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', diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index 26ffaae759..e921020c33 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -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', diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py index 93689193e4..13a0f3c9f4 100755 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -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', diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 543f032dc0..8972e13b0d 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -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', diff --git a/nova/virt/vmwareapi/vim.py b/nova/virt/vmwareapi/vim.py index 7f0cb21346..6aa7acf23f 100644 --- a/nova/virt/vmwareapi/vim.py +++ b/nova/virt/vmwareapi/vim.py @@ -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 ' diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index 5bc99abf47..620d0e12c1 100755 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -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', diff --git a/nova/virt/xenapi/image/bittorrent.py b/nova/virt/xenapi/image/bittorrent.py index 3d33175ad7..a2edaa96f0 100644 --- a/nova/virt/xenapi/image/bittorrent.py +++ b/nova/virt/xenapi/image/bittorrent.py @@ -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, diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py index e0f3d45e19..8d6bc8454a 100644 --- a/nova/volume/cinder.py +++ b/nova/volume/cinder.py @@ -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', diff --git a/nova/wsgi.py b/nova/wsgi.py index bb3d82ecba..e5566300d6 100644 --- a/nova/wsgi.py +++ b/nova/wsgi.py @@ -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, diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py index f5f6357b97..864041a483 100755 --- a/tools/xenserver/vm_vdi_cleaner.py +++ b/tools/xenserver/vm_vdi_cleaner.py @@ -43,7 +43,6 @@ cleaner_opts = [ ] cli_opt = cfg.StrOpt('command', - default=None, help='Cleaner command') CONF = cfg.CONF |