Merge lp:~hopem/maas-deployer/lp1491443 into lp:~maas-deployers/maas-deployer/next

[Edward Hope-Morley]

[Ante Karamatić (ivoks)]

Why don't we do a switch 'fail on error', instead of catching every maas call that we should fail on?

[Edward Hope-Morley (hopem)]

I think we can look into that for the next release. If we implement that kind of logic we have to take a close look at the code to make sure we don't get false positives etc. Basically i think to get that right it will be nontrivial so lets punt it to 0.0.3

[Ante Karamatić (ivoks)]

review: Approve

=== modified file 'maas_deployer/cli.py'
--- maas_deployer/cli.py	2015-08-14 09:16:18 +0000
+++ maas_deployer/cli.py	2015-09-02 14:34:04 +0000
@@ -87,6 +87,8 @@
         engine = DeploymentEngine(config, target)
         engine.deploy(target)
     except:
+        # Remove console handler to avoid displaying the exception twice
+        log.removeHandler(handler)
         log.exception("MAAS deployment failed.")
         raise
     else:

=== modified file 'maas_deployer/vmaas/engine.py'
--- maas_deployer/vmaas/engine.py	2015-09-01 23:15:07 +0000
+++ maas_deployer/vmaas/engine.py	2015-09-02 14:34:04 +0000
@@ -14,13 +14,14 @@
 
 from subprocess import CalledProcessError
 
-
 from maas_deployer.vmaas import (
     vm,
     util,
     template,
 )
-
+from maas_deployer.vmaas.exception import (
+    MAASDeployerClientError,
+)
 from maas_deployer.vmaas.maasclient import (
     bootimages,
     MAASClient,
@@ -417,8 +418,8 @@
         node_group_interfaces = copy.deepcopy(maas_config['node_group_ifaces'])
         for iface in node_group_interfaces:
             if not self.create_nodegroup_interface(client, nodegroup, iface):
-                log.warning("Unable to create nodegroup interface: %s",
-                            iface)
+                msg = "Unable to create nodegroup interface: %s" % iface
+                raise MAASDeployerClientError(msg)
 
         nodes = maas_config.get('nodes', [])
         self._create_maas_nodes(client, nodes)
@@ -461,14 +462,14 @@
         juju_node = self._get_juju_nodename(nodes)
         if juju_node is not None and not virsh_info:
             try:
-                _, stderr = util.virsh(['start', juju_node])
+                util.virsh(['start', juju_node])
             except CalledProcessError as exc:
                 # Ignore already started error
                 msg = 'Domain is already active'
                 if msg not in exc.output:
                     raise
-                else:
-                    log.debug(msg)
+
+                log.debug(msg)
 
         self._wait_for_nodes_to_commission(client)
         self._claim_sticky_ip_address(client, maas_config)

=== modified file 'maas_deployer/vmaas/exception.py'
--- maas_deployer/vmaas/exception.py	2015-08-11 22:28:00 +0000
+++ maas_deployer/vmaas/exception.py	2015-09-02 14:34:04 +0000
@@ -30,3 +30,8 @@
                "running the deployer" % (pool))
 
         super(MAASDeployerPoolNotFound, self).__init__(msg)
+
+
+class MAASDeployerClientError(MAASDeployerBaseException):
+    def __init__(self, msg):
+        super(MAASDeployerClientError, self).__init__(msg)

=== modified file 'maas_deployer/vmaas/maasclient/driver.py'
--- maas_deployer/vmaas/maasclient/driver.py	2015-07-23 16:20:28 +0000
+++ maas_deployer/vmaas/maasclient/driver.py	2015-09-02 14:34:04 +0000
@@ -11,6 +11,10 @@
         self.ok = ok
         self.data = data
 
+    def __nonzero__(self):
+        """Allow boolean comparison"""
+        return bool(self.ok)
+
 
 class MAASDriver(object):
     """