Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

[plstackapi.git] / planetstack / openstack / driver.py

diff --git a/planetstack/openstack/driver.py b/planetstack/openstack/driver.py
index 9183daf..093ab5a 100644 (file)
--- a/planetstack/openstack/driver.py
+++ b/planetstack/openstack/driver.py
@@ -24,23 +24,30 @@ class OpenStackDriver:
 
         self.enabled = manager_enabled
         self.has_openstack = has_openstack
+        self.deployment = None
+        self.admin_user = None
 
     def client_driver(self, caller=None, tenant=None, deployment=None):
+        admin_driver = self.admin_driver(tenant=tenant, deployment=deployment)
         if caller:
             auth = {'username': caller.email,
                     'password': hashlib.md5(caller.password).hexdigest()[:6],
                     'tenant': tenant}
-            client = OpenStackClient(deployment=deployment, **auth)
+            client = OpenStackClient(deployment=admin_driver.deployment, **auth)
         else:
-            client = OpenStackClient(tenant=tenant, deployment=deployment)
+            client = OpenStackClient(tenant=tenant, deployment=admin_driver.deployment)
 
         driver = OpenStackDriver(client=client)
+        driver.admin_user = admin_driver.admin_user
+        driver.deployment = admin_driver.deployment
         return driver
 
     def admin_driver(self, tenant=None, deployment=None):
         deployment = Deployment.objects.get(name=deployment)
         client = OpenStackClient(tenant=tenant, deployment=deployment)
         driver = OpenStackDriver(client=client)
+        driver.admin_user = client.keystone.users.find(name=deployment.admin_user)
+        driver.deployment = deployment
         return driver    
 
     def create_role(self, name):
@@ -410,11 +417,12 @@ class OpenStackDriver:
 
         return (subnet_id, subnet)
 
-    def spawn_instance(self, name, key_name=None, hostname=None, image_id=None, security_group=None, pubkeys=[], nics=None, metadata=None, userdata=None):
-        flavor_name = self.config.nova_default_flavor
+    def spawn_instance(self, name, key_name=None, availability_zone=None, hostname=None, image_id=None, security_group=None, pubkeys=[], nics=None, metadata=None, userdata=None, flavor_name=None):
+        if not flavor_name:
+            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:
             security_group = self.config.nova_default_security_group
 
@@ -422,9 +430,16 @@ class OpenStackDriver:
         #if pubkeys:
         #    files["/root/.ssh/authorized_keys"] = "\n".join(pubkeys).encode('base64')
         hints = {}
-        availability_zone = None
+        
+        # determine availability zone and compute host 
+        availability_zone_filter = None
+        if not availability_zone:
+            availability_zone_filter = 'nova'
+        else: 
+            availability_zone_filter = availability_zone
         if hostname:
-            availability_zone = 'nova:%s' % hostname.split('.')[0]
+            availability_zone_filter += ':%s' % hostname.split('.')[0]
+
         server = self.shell.nova.servers.create(
                                             name=name,
                                             key_name = key_name,
@@ -433,7 +448,7 @@ class OpenStackDriver:
                                             security_group = security_group,
                                             #files = files,
                                             scheduler_hints=hints,
-                                            availability_zone=availability_zone,
+                                            availability_zone=availability_zone_filter,
                                             nics=nics,
                                             networks=nics,
                                             meta=metadata,