valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

salt-cloud: fix two errors that slipped through in the linode driver

Browse Source
This commit is contained in:
Umberto Nicoletti 2015-12-13 17:10:10 +00:00
parent c3ca61097b
commit af9d7bb6b1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/cloud/clouds/linode.py
View File

@ -441,7 +441,7 @@ def create(vm_):
swap_disk_id = create_swap_disk(vm_, node_id)['DiskID']
data_disk_id = None
if get_data_disk(vm_):
data_disk_id = create_data_disk(vm_, node_id, get_data_disk_size(vm_, node_id, get_swap_size(vm_)))['DiskID']
data_disk_id = create_data_disk(vm_, node_id, get_data_disk_size(vm_, get_swap_size(vm_), node_id))['DiskID']
# Add private IP address if requested
private_ip_assignment = get_private_ip(vm_)
@ -462,7 +462,7 @@ def create(vm_):
'linode_id': node_id,
'root_disk_id': root_disk_id,
'swap_disk_id': swap_disk_id,
'data_disk_id': swap_disk_id,
'data_disk_id': data_disk_id,
'helper_network': private_ip_assignment})['ConfigID']
# Boot the Linode
boot(kwargs={'linode_id': node_id,
@ -1625,4 +1625,4 @@ def _get_ssh_interface(vm_):
return config.get_cloud_config_value(
'ssh_interface', vm_, __opts__, default='public_ips',
search_global=False
)
)