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

[Edward Hope-Morley]

[Billy Olsen (billy-olsen)]

LGTM. I will note that libvirt still seems to be placing an error on the output, but we don't end up with a big ugly stack and the commissioning can continue, so I'm +1 on this.

review: Approve

=== modified file 'maas_deployer/vmaas/engine.py'
--- maas_deployer/vmaas/engine.py	2015-09-01 08:18:16 +0000
+++ maas_deployer/vmaas/engine.py	2015-09-01 13:49:36 +0000
@@ -457,7 +457,15 @@
         virsh_info = maas_config.get('virsh')
         juju_node = self._get_juju_nodename(nodes)
         if juju_node is not None and not virsh_info:
-            util.virsh(['start', juju_node])
+            try:
+                _, stderr = 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)
 
         self._wait_for_nodes_to_commission(client)
         self._claim_sticky_ip_address(client, maas_config)