Merge "Check for errors during nova service vm launch" into R2.1

Juniper · Feb 12, 2015 · 906f313 · 906f313
2 parents de76e30 + 04918d2
commit 906f313
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/config/svc-monitor/svc_monitor/nova_client.py b/src/config/svc-monitor/svc_monitor/nova_client.py
@@ -44,7 +44,8 @@ def _novaclient_exec(self, resource, oper, proj_name, **kwargs):
                 "Error: Multiple %s %s=%s found in project %s"
                 % (resource, kwargs.keys()[0], kwargs.values()[0], proj_name))
             return None
-        except Exception:
+        except Exception as e:
+            self.logger.log("Error: nova error %s" % str(e))
             return None
 
     def oper(self, resource, oper, proj_name, **kwargs):

diff --git a/src/config/svc-monitor/svc_monitor/virtual_machine_manager.py b/src/config/svc-monitor/svc_monitor/virtual_machine_manager.py
@@ -54,6 +54,8 @@ def _create_svc_vm(self, instance_name, image_name, nics,
             name=instance_name, image=image,
             flavor=flavor, nics=nics_with_port,
             availability_zone=avail_zone)
+        if not nova_vm:
+            return
         nova_vm.get()
         self.logger.log('Created VM : ' + str(nova_vm))