Merge ~newell-jensen/maas:lp1741165 into maas:master

[Newell Jensen]

LP: #1741165 -- Remove `virsh undefine` --delete-snapshots flag to workaround volumes not being deleted for node decomposition.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1741165 lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 7270a49dd7c0bf71baf0ad4b4be3e0cdfbedd722

review: Approve

[Alberto Donato (ack)]

LGTM

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1741165 lp:~newell-jensen/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1736/consoleText

diff --git a/src/provisioningserver/drivers/pod/tests/test_virsh.py b/src/provisioningserver/drivers/pod/tests/test_virsh.py
index ba3a373..62b285e 100644
--- a/src/provisioningserver/drivers/pod/tests/test_virsh.py
+++ b/src/provisioningserver/drivers/pod/tests/test_virsh.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Canonical Ltd.  This software is licensed under the
+# Copyright 2017-2018 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `provisioningserver.drivers.pod.virsh`."""
@@ -1032,7 +1032,6 @@ class TestVirshSSH(MAASTestCase):
             call([
                 'undefine', domain,
                 '--remove-all-storage',
-                '--delete-snapshots',
                 '--managed-save'])))
 
 
diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
index 64dac66..ee980e5 100644
--- a/src/provisioningserver/drivers/pod/virsh.py
+++ b/src/provisioningserver/drivers/pod/virsh.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Canonical Ltd.  This software is licensed under the
+# Copyright 2017-2018 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Virsh pod driver."""
@@ -771,9 +771,11 @@ class VirshSSH(pexpect.spawn):
         # Ensure that its destroyed first.
         self.run(['destroy', domain])
         # Undefine the domains and remove all storage and snapshots.
+        # XXX newell 2018-02-25 bug=1741165
+        # Removed the --delete-snapshots flag to workaround the volumes not
+        # being deleted.  See the bug for more details.
         self.run([
-            'undefine', domain,
-            '--remove-all-storage', '--delete-snapshots', '--managed-save'])
+            'undefine', domain, '--remove-all-storage', '--managed-save'])
 
 
 class VirshPodDriver(PodDriver):