From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 30 Apr 2013 22:18:03 +0000 (-0400)
Subject: remove refrences to flavor. use m1.small as the default flavor
X-Git-Tag: 1.0~73^2~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e7e304f5d307805fae1869a2b18cf174727c0262;hp=3811937cf1348f21e52cc79838bf11b1da184209;p=plstackapi.git

remove refrences to flavor. use m1.small as the default flavor
---

diff --git a/plstackapi/openstack/driver.py b/plstackapi/openstack/driver.py
index a1a3333..04a4f10 100644
--- a/plstackapi/openstack/driver.py
+++ b/plstackapi/openstack/driver.py
@@ -234,9 +234,9 @@ class OpenStackDriver:
             self.shell.nova.keypairs.delete(key) 
         return 1 
 
-    def spawn_instance(self, name, key_name=None, hostname=None, flavor_id=None, image_id=None, security_group=None, pubkeys=[]):
-        #if not flavor_id:
-        #    flavor = self.config.nova_default_flavor
+    def spawn_instance(self, name, key_name=None, hostname=None, image_id=None, security_group=None, pubkeys=[]):
+        flavor_name = self.config.nova_default_flavor
+        flavor = self.shell.nova.flavors.find(name=flavor_name)
         #if not image:
         #    image = self.config.nova_default_imave
         if not security_group:
@@ -252,7 +252,7 @@ class OpenStackDriver:
         server = self.shell.nova.servers.create(
                                             name=name,
                                             key_name = key_name,
-                                            flavor=flavor_id,
+                                            flavor=flavor.id,
                                             image=image_id,
                                             security_group = security_group,
                                             files=files,