renaming

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

diff --git a/planetstack/openstack/driver.py b/planetstack/openstack/driver.py
index c01fede..b6b6d48 100644 (file)
--- a/planetstack/openstack/driver.py
+++ b/planetstack/openstack/driver.py
@@ -58,7 +58,7 @@ class OpenStackDriver:
             # so we manually delete instances before deleteing the tenant   
             instances = self.shell.nova_db.instance_get_all_by_filters(ctx, 
                        {'project_id': tenant.id}, 'id', 'asc')
-            client = OpenStackClient(tenant=tenant)
+            client = OpenStackClient(tenant=tenant.name)
             driver = OpenStackDriver(client=client)
             for instance in instances:
                 driver.destroy_instance(instance.id)
@@ -264,7 +264,7 @@ class OpenStackDriver:
                     gw_port = port
                     router_id = gw_port['device_id']
                     router = self.shell.quantum.show_router(router_id)['router']
-                    if router:
+                    if router and router.get('external_gateway_info'):
                         ext_net = router['external_gateway_info']['network_id']
                         for port in ports:
                             if port['device_id'] == router_id and port['network_id'] == ext_net: