openstack
/
nova
Code Issues Proposed changes

Merge "Remove deprecated config option names: Juno Edition"

This commit is contained in:
Jenkins 2014-06-15 01:56:54 +00:00 committed by Gerrit Code Review
parent d4d712a88a d0a02fa390
commit 77bad25209
17 changed files with 53 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,8 +53,7 @@ opts = [
help='A list of additional capabilities corresponding to '
'flavor_extra_specs for this compute '
'host to advertise. Valid entries are name=value, pairs '
'For example, "key1:val1, key2:val2"',
deprecated_name='instance_type_extra_specs'),
'For example, "key1:val1, key2:val2"'),
cfg.StrOpt('driver',
default='nova.virt.baremetal.pxe.PXE',
help='Baremetal driver back-end (pxe or tilera)'),

3
nova/virt/cpu.py
View File

@ -24,8 +24,7 @@ LOG = logging.getLogger(__name__)
virt_cpu_opts = [
cfg.StrOpt('vcpu_pin_set',
help='Defines which pcpus that instance vcpus can use. '
'For example, "4-12,^8,15"',
deprecated_group='libvirt'),
'For example, "4-12,^8,15"'),
]
CONF = cfg.CONF

9
nova/virt/imagecache.py
View File

@ -30,17 +30,14 @@ imagecache_opts = [
default='_base',
help='Where cached images are stored under $instances_path. '
'This is NOT the full path - just a folder name. '
'For per-compute-host cached images, set to _base_$my_ip',
deprecated_name='base_dir_name'),
'For per-compute-host cached images, set to _base_$my_ip'),
cfg.BoolOpt('remove_unused_base_images',
default=True,
help='Should unused base images be removed?',
deprecated_group='libvirt'),
help='Should unused base images be removed?'),
cfg.IntOpt('remove_unused_original_minimum_age_seconds',
default=(24 * 3600),
help='Unused unresized base images younger than this will not '
'be removed',
deprecated_group='libvirt'),
'be removed'),
]
CONF = cfg.CONF

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

@ -106,79 +106,58 @@ LOG = logging.getLogger(__name__)
libvirt_opts = [
cfg.StrOpt('rescue_image_id',
help='Rescue ami image. This will not be used if an image id '
'is provided by the user.',
deprecated_group='DEFAULT'),
'is provided by the user.'),
cfg.StrOpt('rescue_kernel_id',
help='Rescue aki image',
deprecated_group='DEFAULT'),
help='Rescue aki image'),
cfg.StrOpt('rescue_ramdisk_id',
help='Rescue ari image',
deprecated_group='DEFAULT'),
help='Rescue ari image'),
cfg.StrOpt('virt_type',
default='kvm',
help='Libvirt domain type (valid options are: '
'kvm, lxc, qemu, uml, xen)',
deprecated_group='DEFAULT',
deprecated_name='libvirt_type'),
'kvm, lxc, qemu, uml, xen)'),
cfg.StrOpt('connection_uri',
default='',
help='Override the default libvirt URI '
'(which is dependent on virt_type)',
deprecated_group='DEFAULT',
deprecated_name='libvirt_uri'),
'(which is dependent on virt_type)'),
cfg.BoolOpt('inject_password',
default=False,
help='Inject the admin password at boot time, '
'without an agent.',
deprecated_name='libvirt_inject_password',
deprecated_group='DEFAULT'),
'without an agent.'),
cfg.BoolOpt('inject_key',
default=False,
help='Inject the ssh public key at boot time',
deprecated_name='libvirt_inject_key',
deprecated_group='DEFAULT'),
help='Inject the ssh public key at boot time'),
cfg.IntOpt('inject_partition',
default=-2,
help='The partition to inject to : '
'-2 => disable, -1 => inspect (libguestfs only), '
'0 => not partitioned, >0 => partition number',
deprecated_name='libvirt_inject_partition',
deprecated_group='DEFAULT'),
'0 => not partitioned, >0 => partition number'),
cfg.BoolOpt('use_usb_tablet',
default=True,
help='Sync virtual and real mouse cursors in Windows VMs',
deprecated_group='DEFAULT'),
help='Sync virtual and real mouse cursors in Windows VMs'),
cfg.StrOpt('live_migration_uri',
default="qemu+tcp://%s/system",
help='Migration target URI '
'(any included "%s" is replaced with '
'the migration target hostname)',
deprecated_group='DEFAULT'),
'the migration target hostname)'),
cfg.StrOpt('live_migration_flag',
default='VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER',
help='Migration flags to be set for live migration',
deprecated_group='DEFAULT'),
help='Migration flags to be set for live migration'),
cfg.StrOpt('block_migration_flag',
default='VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, '
'VIR_MIGRATE_NON_SHARED_INC',
help='Migration flags to be set for block migration',
deprecated_group='DEFAULT'),
help='Migration flags to be set for block migration'),
cfg.IntOpt('live_migration_bandwidth',
default=0,
help='Maximum bandwidth to be used during migration, in Mbps',
deprecated_group='DEFAULT'),
help='Maximum bandwidth to be used during migration, in Mbps'),
cfg.StrOpt('snapshot_image_format',
help='Snapshot image format (valid options are : '
'raw, qcow2, vmdk, vdi). '
'Defaults to same as source image',
deprecated_group='DEFAULT'),
'Defaults to same as source image'),
cfg.StrOpt('vif_driver',
default='nova.virt.libvirt.vif.LibvirtGenericVIFDriver',
help='DEPRECATED. The libvirt VIF driver to configure the VIFs.'
'This option is deprecated and will be removed in the '
'Juno release.',
deprecated_name='libvirt_vif_driver',
deprecated_group='DEFAULT'),
'Juno release.'),
cfg.ListOpt('volume_drivers',
default=[
'iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver',
@ -196,52 +175,38 @@ libvirt_opts = [
'scality='
'nova.virt.libvirt.volume.LibvirtScalityVolumeDriver',
],
help='Libvirt handlers for remote volumes.',
deprecated_name='libvirt_volume_drivers',
deprecated_group='DEFAULT'),
help='Libvirt handlers for remote volumes.'),
cfg.StrOpt('disk_prefix',
help='Override the default disk prefix for the devices attached'
' to a server, which is dependent on virt_type. '
'(valid options are: sd, xvd, uvd, vd)',
deprecated_name='libvirt_disk_prefix',
deprecated_group='DEFAULT'),
'(valid options are: sd, xvd, uvd, vd)'),
cfg.IntOpt('wait_soft_reboot_seconds',
default=120,
help='Number of seconds to wait for instance to shut down after'
' soft reboot request is made. We fall back to hard reboot'
' if instance does not shutdown within this window.',
deprecated_name='libvirt_wait_soft_reboot_seconds',
deprecated_group='DEFAULT'),
' if instance does not shutdown within this window.'),
cfg.StrOpt('cpu_mode',
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; '
'to "none" to not set any CPU model. '
'If virt_type="kvm|qemu", it will default to '
'"host-model", otherwise it will default to "none"',
deprecated_name='libvirt_cpu_mode',
deprecated_group='DEFAULT'),
'"host-model", otherwise it will default to "none"'),
cfg.StrOpt('cpu_model',
help='Set to a named libvirt CPU model (see names listed '
'in /usr/share/libvirt/cpu_map.xml). Only has effect if '
'cpu_mode="custom" and virt_type="kvm|qemu"',
deprecated_name='libvirt_cpu_model',
deprecated_group='DEFAULT'),
'cpu_mode="custom" and virt_type="kvm|qemu"'),
cfg.StrOpt('snapshots_directory',
default='$instances_path/snapshots',
help='Location where libvirt driver will store snapshots '
'before uploading them to image service',
deprecated_name='libvirt_snapshots_directory',
deprecated_group='DEFAULT'),
'before uploading them to image service'),
cfg.StrOpt('xen_hvmloader_path',
default='/usr/lib/xen/boot/hvmloader',
help='Location where the Xen hvmloader is kept',
deprecated_group='DEFAULT'),
help='Location where the Xen hvmloader is kept'),
cfg.ListOpt('disk_cachemodes',
default=[],
help='Specific cachemodes to use for different disk types '
'e.g: file=directsync,block=none',
deprecated_group='DEFAULT'),
'e.g: file=directsync,block=none'),
cfg.StrOpt('rng_dev_path',
help='A path to a device that will be used as source of '
'entropy on the host. Permitted options are: '

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

@ -48,20 +48,14 @@ __imagebackend_opts = [
default='default',
help='VM Images format. Acceptable values are: raw, qcow2, lvm,'
' rbd, default. If default is specified,'
' then use_cow_images flag is used instead of this one.',
deprecated_group='DEFAULT',
deprecated_name='libvirt_images_type'),
' then use_cow_images flag is used instead of this one.'),
cfg.StrOpt('images_volume_group',
help='LVM Volume Group that is used for VM images, when you'
' specify images_type=lvm.',
deprecated_group='DEFAULT',
deprecated_name='libvirt_images_volume_group'),
' specify images_type=lvm.'),
cfg.BoolOpt('sparse_logical_volumes',
default=False,
help='Create sparse logical volumes (with virtualsize)'
' if this flag is set to True.',
deprecated_group='DEFAULT',
deprecated_name='libvirt_sparse_logical_volumes'),
' if this flag is set to True.'),
cfg.StrOpt('volume_clear',
default='zero',
help='Method used to wipe old volumes (valid options are: '
@ -71,14 +65,10 @@ __imagebackend_opts = [
help='Size in MiB to wipe at start of old volumes. 0 => all'),
cfg.StrOpt('images_rbd_pool',
default='rbd',
help='The RADOS pool in which rbd volumes are stored',
deprecated_group='DEFAULT',
deprecated_name='libvirt_images_rbd_pool'),
help='The RADOS pool in which rbd volumes are stored'),
cfg.StrOpt('images_rbd_ceph_conf',
default='', # default determined by librados
help='Path to the ceph configuration file to use',
deprecated_group='DEFAULT',
deprecated_name='libvirt_images_rbd_ceph_conf'),
help='Path to the ceph configuration file to use'),
]
CONF = cfg.CONF

15
nova/virt/libvirt/imagecache.py
View File

@ -44,28 +44,23 @@ imagecache_opts = [
default='$instances_path/$image_cache_subdirectory_name/'
'%(image)s.info',
help='Allows image information files to be stored in '
'non-standard locations',
deprecated_group='DEFAULT'),
'non-standard locations'),
cfg.BoolOpt('remove_unused_kernels',
default=False,
help='Should unused kernel images be removed? This is only '
'safe to enable if all compute nodes have been updated '
'to support this option. This will be enabled by default '
'in future.',
deprecated_group='DEFAULT'),
'in future.'),
cfg.IntOpt('remove_unused_resized_minimum_age_seconds',
default=3600,
help='Unused resized base images younger than this will not be '
'removed',
deprecated_group='DEFAULT'),
'removed'),
cfg.BoolOpt('checksum_base_images',
default=False,
help='Write a checksum for files in _base to disk',
deprecated_group='DEFAULT'),
help='Write a checksum for files in _base to disk'),
cfg.IntOpt('checksum_interval_seconds',
default=3600,
help='How frequently to checksum base images',
deprecated_group='DEFAULT'),
help='How frequently to checksum base images'),
]
CONF = cfg.CONF

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

@ -41,9 +41,7 @@ libvirt_opts = [
cfg.BoolOpt('snapshot_compression',
default=False,
help='Compress snapshot images when possible. This '
'currently applies exclusively to qcow2 images',
deprecated_group='DEFAULT',
deprecated_name='libvirt_snapshot_compression'),
'currently applies exclusively to qcow2 images'),
]
CONF = cfg.CONF

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

@ -36,9 +36,7 @@ LOG = logging.getLogger(__name__)
libvirt_vif_opts = [
cfg.BoolOpt('use_virtio_for_bridges',
default=True,
help='Use virtio for bridge interfaces with KVM/QEMU',
deprecated_group='DEFAULT',
deprecated_name='libvirt_use_virtio_for_bridges'),
help='Use virtio for bridge interfaces with KVM/QEMU'),
]
CONF = cfg.CONF

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

@ -41,59 +41,44 @@ LOG = logging.getLogger(__name__)
volume_opts = [
cfg.IntOpt('num_iscsi_scan_tries',
default=5,
help='Number of times to rescan iSCSI target to find volume',
deprecated_group='DEFAULT'),
help='Number of times to rescan iSCSI target to find volume'),
cfg.IntOpt('num_iser_scan_tries',
default=5,
help='Number of times to rescan iSER target to find volume',
deprecated_group='DEFAULT'),
help='Number of times to rescan iSER target to find volume'),
cfg.StrOpt('rbd_user',
help='The RADOS client name for accessing rbd volumes',
deprecated_group='DEFAULT'),
help='The RADOS client name for accessing rbd volumes'),
cfg.StrOpt('rbd_secret_uuid',
help='The libvirt UUID of the secret for the rbd_user'
'volumes',
deprecated_group='DEFAULT'),
'volumes'),
cfg.StrOpt('nfs_mount_point_base',
default=paths.state_path_def('mnt'),
help='Directory where the NFS volume is mounted on the'
' compute node',
deprecated_group='DEFAULT'),
' compute node'),
cfg.StrOpt('nfs_mount_options',
help='Mount options passedf to the NFS client. See section '
'of the nfs man page for details',
deprecated_group='DEFAULT'),
'of the nfs man page for details'),
cfg.IntOpt('num_aoe_discover_tries',
default=3,
help='Number of times to rediscover AoE target to find volume',
deprecated_group='DEFAULT'),
help='Number of times to rediscover AoE target to find volume'),
cfg.StrOpt('glusterfs_mount_point_base',
default=paths.state_path_def('mnt'),
help='Directory where the glusterfs volume is mounted on the '
'compute node',
deprecated_group='DEFAULT'),
'compute node'),
cfg.BoolOpt('iscsi_use_multipath',
default=False,
help='Use multipath connection of the iSCSI volume',
deprecated_group='DEFAULT',
deprecated_name='libvirt_iscsi_use_multipath'),
help='Use multipath connection of the iSCSI volume'),
cfg.BoolOpt('iser_use_multipath',
default=False,
help='Use multipath connection of the iSER volume',
deprecated_group='DEFAULT',
deprecated_name='libvirt_iser_use_multipath'),
help='Use multipath connection of the iSER volume'),
cfg.StrOpt('scality_sofs_config',
help='Path or URL to Scality SOFS configuration file',
deprecated_group='DEFAULT'),
help='Path or URL to Scality SOFS configuration file'),
cfg.StrOpt('scality_sofs_mount_point',
default='$state_path/scality',
help='Base dir where Scality SOFS shall be mounted',
deprecated_group='DEFAULT'),
help='Base dir where Scality SOFS shall be mounted'),
cfg.ListOpt('qemu_allowed_storage_drivers',
default=[],
help='Protocols listed here will be accessed directly '
'from QEMU. Currently supported protocols: [gluster]',
deprecated_group='DEFAULT')
'from QEMU. Currently supported protocols: [gluster]')
]
CONF = cfg.CONF

13
nova/virt/xenapi/agent.py
View File

@ -48,25 +48,17 @@ LOG = logging.getLogger(__name__)
xenapi_agent_opts = [
cfg.IntOpt('agent_timeout',
default=30,
deprecated_name='agent_timeout',
deprecated_group='DEFAULT',
help='Number of seconds to wait for agent reply'),
cfg.IntOpt('agent_version_timeout',
default=300,
deprecated_name='agent_version_timeout',
deprecated_group='DEFAULT',
help='Number of seconds to wait for agent '
'to be fully operational'),
cfg.IntOpt('agent_resetnetwork_timeout',
deprecated_name='agent_resetnetwork_timeout',
deprecated_group='DEFAULT',
default=60,
help='Number of seconds to wait for agent reply '
'to resetnetwork request'),
cfg.StrOpt('agent_path',
default='usr/sbin/xe-update-networking',
deprecated_name='xenapi_agent_path',
deprecated_group='DEFAULT',
help='Specifies the path in which the XenAPI guest agent '
'should be located. If the agent is present, network '
'configuration is not injected into the image. '
@ -74,14 +66,10 @@ xenapi_agent_opts = [
'flat_injected=True'),
cfg.BoolOpt('disable_agent',
default=False,
deprecated_name='xenapi_disable_agent',
deprecated_group='DEFAULT',
help='Disables the use of the XenAPI agent in any image '
'regardless of what image properties are present.'),
cfg.BoolOpt('use_agent_default',
default=False,
deprecated_name='xenapi_use_agent_default',
deprecated_group='DEFAULT',
help='Determines if the XenAPI agent should be used when '
'the image used does not contain a hint to declare if '
'the agent is present or not. '
@ -92,7 +80,6 @@ xenapi_agent_opts = [
]
CONF = cfg.CONF
# xenapi_agent options in the DEFAULT group were deprecated in Icehouse
CONF.register_opts(xenapi_agent_opts, 'xenserver')

4
nova/virt/xenapi/client/session.py
View File

@ -39,13 +39,9 @@ LOG = logging.getLogger(__name__)
xenapi_session_opts = [
cfg.IntOpt('login_timeout',
default=10,
deprecated_name='xenapi_login_timeout',
deprecated_group='DEFAULT',
help='Timeout in seconds for XenAPI login.'),
cfg.IntOpt('connection_concurrent',
default=5,
deprecated_name='xenapi_connection_concurrent',
deprecated_group='DEFAULT',
help='Maximum number of concurrent XenAPI connections. '
'Used only if compute_driver=xenapi.XenAPIDriver'),
]

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

@ -57,79 +57,54 @@ LOG = logging.getLogger(__name__)
xenapi_opts = [
cfg.StrOpt('connection_url',
deprecated_name='xenapi_connection_url',
deprecated_group='DEFAULT',
help='URL for connection to XenServer/Xen Cloud Platform. '
'A special value of unix://local can be used to connect '
'to the local unix socket. '
'Required if compute_driver=xenapi.XenAPIDriver'),
cfg.StrOpt('connection_username',
default='root',
deprecated_name='xenapi_connection_username',
deprecated_group='DEFAULT',
help='Username for connection to XenServer/Xen Cloud Platform. '
'Used only if compute_driver=xenapi.XenAPIDriver'),
cfg.StrOpt('connection_password',
deprecated_name='xenapi_connection_password',
deprecated_group='DEFAULT',
help='Password for connection to XenServer/Xen Cloud Platform. '
'Used only if compute_driver=xenapi.XenAPIDriver',
secret=True),
cfg.FloatOpt('vhd_coalesce_poll_interval',
default=5.0,
deprecated_name='xenapi_vhd_coalesce_poll_interval',
deprecated_group='DEFAULT',
help='The interval used for polling of coalescing vhds. '
'Used only if compute_driver=xenapi.XenAPIDriver'),
cfg.BoolOpt('check_host',
default=True,
deprecated_name='xenapi_check_host',
deprecated_group='DEFAULT',
help='Ensure compute service is running on host XenAPI '
'connects to.'),
cfg.IntOpt('vhd_coalesce_max_attempts',
default=20,
deprecated_name='xenapi_vhd_coalesce_max_attempts',
deprecated_group='DEFAULT',
help='Max number of times to poll for VHD to coalesce. '
'Used only if compute_driver=xenapi.XenAPIDriver'),
cfg.StrOpt('sr_base_path',
default='/var/run/sr-mount',
deprecated_name='xenapi_sr_base_path',
deprecated_group='DEFAULT',
help='Base path to the storage repository'),
cfg.StrOpt('target_host',
deprecated_name='target_host',
deprecated_group='DEFAULT',
help='The iSCSI Target Host'),
cfg.StrOpt('target_port',
default='3260',
deprecated_name='target_port',
deprecated_group='DEFAULT',
help='The iSCSI Target Port, default is port 3260'),
cfg.StrOpt('iqn_prefix',
default='iqn.2010-10.org.openstack',
deprecated_name='iqn_prefix',
deprecated_group='DEFAULT',
help='IQN Prefix'),
# NOTE(sirp): This is a work-around for a bug in Ubuntu Maverick,
# when we pull support for it, we should remove this
cfg.BoolOpt('remap_vbd_dev',
default=False,
deprecated_name='xenapi_remap_vbd_dev',
deprecated_group='DEFAULT',
help='Used to enable the remapping of VBD dev '
'(Works around an issue in Ubuntu Maverick)'),
cfg.StrOpt('remap_vbd_dev_prefix',
default='sd',
deprecated_name='xenapi_remap_vbd_dev_prefix',
deprecated_group='DEFAULT',
help='Specify prefix to remap VBD dev to '
'(ex. /dev/xvdb -> /dev/sdb)'),
]
CONF = cfg.CONF
# xenapi options in the DEFAULT group were deprecated in Icehouse
CONF.register_opts(xenapi_opts, 'xenserver')
CONF.import_opt('host', 'nova.netconf')

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

@ -26,53 +26,36 @@ LOG = logging.getLogger(__name__)
xenapi_torrent_opts = [
cfg.StrOpt('torrent_base_url',
deprecated_name='xenapi_torrent_base_url',
deprecated_group='DEFAULT',
help='Base URL for torrent files.'),
cfg.FloatOpt('torrent_seed_chance',
default=1.0,
deprecated_name='xenapi_torrent_seed_chance',
deprecated_group='DEFAULT',
help='Probability that peer will become a seeder.'
' (1.0 = 100%)'),
cfg.IntOpt('torrent_seed_duration',
default=3600,
deprecated_name='xenapi_torrent_seed_duration',
deprecated_group='DEFAULT',
help='Number of seconds after downloading an image via'
' BitTorrent that it should be seeded for other peers.'),
cfg.IntOpt('torrent_max_last_accessed',
default=86400,
deprecated_name='xenapi_torrent_max_last_accessed',
deprecated_group='DEFAULT',
help='Cached torrent files not accessed within this number of'
' seconds can be reaped'),
cfg.IntOpt('torrent_listen_port_start',
default=6881,
deprecated_name='xenapi_torrent_listen_port_start',
deprecated_group='DEFAULT',
help='Beginning of port range to listen on'),
cfg.IntOpt('torrent_listen_port_end',
default=6891,
deprecated_name='xenapi_torrent_listen_port_end',
deprecated_group='DEFAULT',
help='End of port range to listen on'),
cfg.IntOpt('torrent_download_stall_cutoff',
default=600,
deprecated_name='xenapi_torrent_download_stall_cutoff',
deprecated_group='DEFAULT',
help='Number of seconds a download can remain at the same'
' progress percentage w/o being considered a stall'),
cfg.IntOpt('torrent_max_seeder_processes_per_host',
default=1,
deprecated_name='xenapi_torrent_max_seeder_processes_per_host',
deprecated_group='DEFAULT',
help='Maximum number of seeder processes to run concurrently'
' within a given dom0. (-1 = no limit)')
]
CONF = cfg.CONF
# xenapi_torrent options in the DEFAULT group were deprecated in Icehouse
CONF.register_opts(xenapi_torrent_opts, 'xenserver')

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

@ -32,9 +32,6 @@ LOG = logging.getLogger(__name__)
xenapi_pool_opts = [
cfg.BoolOpt('use_join_force',
#Deprecated in Icehouse
deprecated_name='use_join_force',
deprecated_group='DEFAULT',
default=True,
help='To use for hosts with different CPUs'),
]

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

@ -26,9 +26,6 @@ from nova.virt.xenapi import vm_utils
xenapi_ovs_integration_bridge_opt = cfg.StrOpt('ovs_integration_bridge',
default='xapi1',
#Deprecated in Icehouse
deprecated_name='xenapi_ovs_integration_bridge',
deprecated_group='DEFAULT',
help='Name of Integration Bridge used by Open vSwitch')
CONF = cfg.CONF

25
nova/virt/xenapi/vm_utils.py
View File

@ -63,37 +63,25 @@ LOG = logging.getLogger(__name__)
xenapi_vm_utils_opts = [
cfg.StrOpt('cache_images',
default='all',
deprecated_name='cache_images',
deprecated_group='DEFAULT',
help='Cache glance images locally. `all` will cache all'
' images, `some` will only cache images that have the'
' image_property `cache_in_nova=True`, and `none` turns'
' off caching entirely'),
cfg.IntOpt('image_compression_level',
deprecated_name='xenapi_image_compression_level',
deprecated_group='DEFAULT',
help='Compression level for images, e.g., 9 for gzip -9.'
' Range is 1-9, 9 being most compressed but most CPU'
' intensive on dom0.'),
cfg.StrOpt('default_os_type',
default='linux',
deprecated_name='default_os_type',
deprecated_group='DEFAULT',
help='Default OS type'),
cfg.IntOpt('block_device_creation_timeout',
default=10,
deprecated_name='block_device_creation_timeout',
deprecated_group='DEFAULT',
help='Time to wait for a block device to be created'),
cfg.IntOpt('max_kernel_ramdisk_size',
default=16 * units.Mi,
deprecated_name='max_kernel_ramdisk_size',
deprecated_group='DEFAULT',
help='Maximum size in bytes of kernel or ramdisk images'),
cfg.StrOpt('sr_matching_filter',
default='default-sr:true',
deprecated_name='sr_matching_filter',
deprecated_group='DEFAULT',
help='Filter for finding the SR to be used to install guest '
'instances on. To use the Local Storage in default '
'XenServer/XCP installations set this flag to '
@ -104,41 +92,28 @@ xenapi_vm_utils_opts = [
'set this flag to: default-sr:true'),
cfg.BoolOpt('sparse_copy',
default=True,
deprecated_name='xenapi_sparse_copy',
deprecated_group='DEFAULT',
help='Whether to use sparse_copy for copying data on a '
'resize down (False will use standard dd). This speeds '
'up resizes down considerably since large runs of zeros '
'won\'t have to be rsynced'),
cfg.IntOpt('num_vbd_unplug_retries',
default=10,
deprecated_name='xenapi_num_vbd_unplug_retries',
deprecated_group='DEFAULT',
help='Maximum number of retries to unplug VBD'),
cfg.StrOpt('torrent_images',
default='none',
deprecated_name='xenapi_torrent_images',
deprecated_group='DEFAULT',
help='Whether or not to download images via Bit Torrent '
'(all|some|none).'),
cfg.StrOpt('ipxe_network_name',
deprecated_name='xenapi_ipxe_network_name',
deprecated_group='DEFAULT',
help='Name of network to use for booting iPXE ISOs'),
cfg.StrOpt('ipxe_boot_menu_url',
deprecated_name='xenapi_ipxe_boot_menu_url',
deprecated_group='DEFAULT',
help='URL to the iPXE boot menu'),
cfg.StrOpt('ipxe_mkisofs_cmd',
default='mkisofs',
deprecated_name='xenapi_ipxe_mkisofs_cmd',
deprecated_group='DEFAULT',
help='Name and optionally path of the tool used for '
'ISO image creation'),
]
CONF = cfg.CONF
# xenapi_vm_utils options in the DEFAULT group were deprecated in Icehouse
CONF.register_opts(xenapi_vm_utils_opts, 'xenserver')
CONF.import_opt('default_ephemeral_format', 'nova.virt.driver')
CONF.import_opt('use_cow_images', 'nova.virt.driver')

7
nova/virt/xenapi/vmops.py
View File

@ -61,24 +61,17 @@ LOG = logging.getLogger(__name__)
xenapi_vmops_opts = [
cfg.IntOpt('running_timeout',
default=60,
deprecated_name='xenapi_running_timeout',
deprecated_group='DEFAULT',
help='Number of seconds to wait for instance '
'to go to running state'),
cfg.StrOpt('vif_driver',
default='nova.virt.xenapi.vif.XenAPIBridgeDriver',
deprecated_name='xenapi_vif_driver',
deprecated_group='DEFAULT',
help='The XenAPI VIF driver using XenServer Network APIs.'),
cfg.StrOpt('image_upload_handler',
default='nova.virt.xenapi.image.glance.GlanceStore',
deprecated_name='xenapi_image_upload_handler',
deprecated_group='DEFAULT',
help='Dom0 plugin driver used to handle image uploads.'),
]
CONF = cfg.CONF
# xenapi_vmops options in the DEFAULT group were deprecated in Icehouse
CONF.register_opts(xenapi_vmops_opts, 'xenserver')
CONF.import_opt('host', 'nova.netconf')
CONF.import_opt('vncserver_proxyclient_address', 'nova.vnc')