saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #49278 from rallytime/bp-49253

Browse source 
Back-port #49253 to 2017.7
This commit is contained in:
Nicole Thomas 2018-08-23 12:28:03 -04:00 • committed by GitHub
commit 221ea22dd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/cloud/clouds/vmware.py
View file

@ -623,6 +623,19 @@ def _get_size_spec(device, size_gb=None, size_kb=None):
return disk_spec
def _iter_disk_unit_number(unit_number):
'''
Apparently vmware reserves ID 7 for SCSI controllers, so we cannot specify
hard drives for 7.
Skip 7 to make sure.
'''
unit_number += 1
if unit_number == 7:
unit_number += 1
return unit_number
def _manage_devices(devices, vm=None, container_ref=None, new_vm_name=None):
unit_number = 0
bus_number = 0
@ -644,7 +657,7 @@ def _manage_devices(devices, vm=None, container_ref=None, new_vm_name=None):
# this is a hard disk
if 'disk' in list(devices.keys()):
# there is atleast one disk specified to be created/configured
unit_number += 1
unit_number = _iter_disk_unit_number(unit_number)
existing_disks_label.append(device.deviceInfo.label)
if device.deviceInfo.label in list(devices['disk'].keys()):
disk_spec = None
@ -808,7 +821,7 @@ def _manage_devices(devices, vm=None, container_ref=None, new_vm_name=None):
break
device_specs.append(disk_spec)
unit_number += 1
unit_number = _iter_disk_unit_number(unit_number)
if 'cd' in list(devices.keys()):
cd_drives_to_create = list(set(devices['cd'].keys()) - set(existing_cd_drives_label))