git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix name of parameter passed to create sliver
[plstackapi.git]
/
planetstack
/
openstack
/
driver.py
diff --git
a/planetstack/openstack/driver.py
b/planetstack/openstack/driver.py
index
a6addba
..
41a653d
100644
(file)
--- a/
planetstack/openstack/driver.py
+++ b/
planetstack/openstack/driver.py
@@
-358,7
+358,7
@@
class OpenStackDriver:
return (subnet_id, subnet)
return (subnet_id, subnet)
- def spawn_instance(self, name, key_name=None, hostname=None, image_id=None, security_group=None, pubkeys=[], n
etwork
s=None):
+ def spawn_instance(self, name, key_name=None, hostname=None, image_id=None, security_group=None, pubkeys=[], n
ic
s=None):
flavor_name = self.config.nova_default_flavor
flavor = self.shell.nova.flavors.find(name=flavor_name)
#if not image:
flavor_name = self.config.nova_default_flavor
flavor = self.shell.nova.flavors.find(name=flavor_name)
#if not image:
@@
-383,7
+383,7
@@
class OpenStackDriver:
files=files,
scheduler_hints=hints,
availability_zone=availability_zone,
files=files,
scheduler_hints=hints,
availability_zone=availability_zone,
- n
etworks=network
s)
+ n
ics=nic
s)
return server
def destroy_instance(self, id):
return server
def destroy_instance(self, id):