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

Fix connection management for EC2 cloud

Browse Source
This commit is contained in:
Thomas S Hatch 2012-06-19 11:55:24 -06:00
parent fb03a619ee
commit 4c2293d6e9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
saltcloud/clouds/EC2.py
View File

@ -15,7 +15,7 @@ from libcloud.compute.deployment import MultiStepDeployment, ScriptDeployment, S
import saltcloud.utils
def conn(vm_):
def get_conn(vm_):
'''
Return a conn object for the passed vm data
'''
@ -114,13 +114,13 @@ def create(vm_):
'''
Create a single vm from a data dict
'''
connection = conn(vm_)
conn = get_conn(vm_)
msd = MultiStepDeployment([ssh_pub(vm_), script(vm_)])
image = image(conn, vm_)
img = image(conn, vm_)
size = size(conn, vm_)
return conn.deploy_node(
name=vm_['name'],
image=image,
image=img,
size=size,
deploy=msd,
ex_keyname=keyname(vm_),