diff options
| author | Stephen Finucane <stephenfin@redhat.com> | 2020-08-31 14:59:48 +0100 |
|---|---|---|
| committer | Stephen Finucane <stephenfin@redhat.com> | 2020-09-11 14:09:06 +0100 |
| commit | 7991155454c2f3093a18de6e44b701c13fbeb1ad (patch) | |
| tree | 6f1f59a1d634273a64de8b0338b9ae2dd6589c7d /nova/compute | |
| parent | adb28f503ca8c38bd7224ec0a335f730557d7ca9 (diff) | |
| download | nova-7991155454c2f3093a18de6e44b701c13fbeb1ad.tar.gz | |
virt: Remove 'is_xenapi' helper
This will never be true now.
Change-Id: I10c3542e06a4d8132314aaac5cf5a905e1f8a270
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/utils.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/nova/compute/utils.py b/nova/compute/utils.py index 63cd5b5ffa..ec0591d493 100644 --- a/nova/compute/utils.py +++ b/nova/compute/utils.py @@ -53,7 +53,6 @@ from nova.objects import fields from nova import rpc from nova import safe_utils from nova import utils -from nova.virt import driver CONF = nova.conf.CONF LOG = log.getLogger(__name__) @@ -229,10 +228,6 @@ def get_next_device_name(instance, device_name_list, except (TypeError, AttributeError, ValueError): raise exception.InvalidDevicePath(path=root_device_name) - # NOTE(vish): remove this when xenapi is setting default_root_device - if driver.is_xenapi(): - prefix = '/dev/xvd' - if req_prefix != prefix: LOG.debug("Using %(prefix)s instead of %(req_prefix)s", {'prefix': prefix, 'req_prefix': req_prefix}) @@ -242,16 +237,6 @@ def get_next_device_name(instance, device_name_list, letter = block_device.get_device_letter(device_path) used_letters.add(letter) - # NOTE(vish): remove this when xenapi is properly setting - # default_ephemeral_device and default_swap_device - if driver.is_xenapi(): - flavor = instance.get_flavor() - if flavor.ephemeral_gb: - used_letters.add('b') - - if flavor.swap: - used_letters.add('c') - check_max_disk_devices_to_attach(len(used_letters) + 1) if not req_letter: |