valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow attaching data disks to VM during creation

Browse Source
This commit is contained in:
Joseph Hall 2016-06-01 11:02:10 -06:00
parent 9d433da5fb
commit 6d344e8b2d
1 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
salt/cloud/clouds/azurearm.py
View File

@ -41,6 +41,7 @@ import base64
import salt.cache
import salt.config as config
import salt.utils.cloud
import salt.ext.six as six
from salt.exceptions import SaltCloudSystemExit
# Import 3rd-party libs
@ -56,6 +57,7 @@ try:
)
from azure.mgmt.compute.models import (
CachingTypes,
DataDisk,
DiskCreateOptionTypes,
HardwareProfile,
ImageReference,
@ -895,12 +897,59 @@ def request_instance(call=None, kwargs=None): # pylint: disable=unused-argument
)
)
if isinstance(kwargs.get('volumes'), str):
volumes = yaml.safe_load(kwargs['volumes'])
else:
volumes = kwargs.get('volumes')
data_disks = None
if isinstance(volumes, list):
data_disks = []
else:
volumes = []
for volume in volumes:
if isinstance(volume, six.string_types):
volume = {'name': volume}
# Use the size keyword to set a size, but you can use either the new
# azure name (disk_size_gb) or the old (logical_disk_size_in_gb)
# instead. If none are set, the disk has size 100GB.
volume.setdefault(
'disk_size_gb', volume.get(
'logical_disk_size_in_gb', volume.get('size', 100)
)
)
# Old kwarg was host_caching, new name is caching
volume.setdefault('caching', volume.get('host_caching', 'ReadOnly'))
volume.setdefault('lun', 0)
# The default vhd is {vm_name}-disk-{lun}.vhd
if 'media_link' in volume:
volume['vhd'] = VirtualHardDisk(volume['media_link'])
del volume['media_link']
elif 'vhd' in volume:
volume['vhd'] = VirtualHardDisk(volume['vhd'])
else:
volume['vhd'] = VirtualHardDisk(
'https://{0}.blob.core.windows.net/vhds/{1}-disk-{2}.vhd'.format(
vm_['storage_account'],
vm_['name'],
volume['lun'],
),
)
if 'image' in volume:
volume['create_option'] = DiskCreateOptionTypes.from_image
elif 'attach' in volume:
volume['create_option'] = DiskCreateOptionTypes.attach
else:
volume['create_option'] = DiskCreateOptionTypes.empty
data_disks.append(DataDisk(**volume))
win_installer = config.get_cloud_config_value(
'win_installer', vm_, __opts__, search_global=True
)
if vm_['image'].startswith('http'):
# https://{storage_account}.blob.core.windows.net/{path}/{vhd}
source_image = VirtualHardDisk(uri=vm_['image'])
source_image = VirtualHardDisk(vm_['image'])
img_ref = None
if win_installer:
os_type = 'Windows'
@ -932,7 +981,7 @@ def request_instance(call=None, kwargs=None): # pylint: disable=unused-argument
create_option=DiskCreateOptionTypes.from_image,
name=disk_name,
vhd=VirtualHardDisk(
uri='https://{0}.blob.core.windows.net/vhds/{1}.vhd'.format(
'https://{0}.blob.core.windows.net/vhds/{1}.vhd'.format(
vm_['storage_account'],
disk_name,
),
@ -940,6 +989,7 @@ def request_instance(call=None, kwargs=None): # pylint: disable=unused-argument
os_type=os_type,
image=source_image,
),
data_disks=data_disks,
image_reference=img_ref,
),
os_profile=OSProfile(