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 #28141 from rallytime/fix-28118

Browse source 
Don't use RAM for root disk size in linode.py
This commit is contained in:
Mike Place 2015-10-20 11:32:29 -06:00
commit 5f99bd4dc6
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/cloud/clouds/linode.py
View file

@ -588,12 +588,10 @@ def create_disk_from_distro(vm_, linode_id, swap_size=None):
'The Linode driver requires a password.'
)
distribution_id = get_distribution_id(vm_)
kwargs.update({'LinodeID': linode_id,
'DistributionID': distribution_id,
'DistributionID': get_distribution_id(vm_),
'Label': vm_['name'],
'Size': get_disk_size(vm_, swap_size)})
'Size': get_disk_size(vm_, swap_size, linode_id)})
result = _query('linode', 'disk.createfromdistribution', args=kwargs)
@ -746,15 +744,14 @@ def get_datacenter_id(location):
return avail_locations()[location]['DATACENTERID']
def get_disk_size(vm_, swap):
def get_disk_size(vm_, swap, linode_id):
r'''
Returns the size of of the root disk in MB.
vm_
The VM to get the disk size for.
'''
vm_size = get_vm_size(vm_)
disk_size = vm_size
disk_size = get_linode(kwargs={'linode_id': linode_id})['TOTALHD']
return config.get_cloud_config_value(
'disk_size', vm_, __opts__, default=disk_size - swap
)
@ -965,7 +962,7 @@ def get_swap_size(vm_):
The VM profile to obtain the swap size from.
'''
return config.get_cloud_config_value(
'wap', vm_, __opts__, default=128
'swap', vm_, __opts__, default=128
)