MAAS

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

  1. Git
  2. lp:~newell-jensen/maas
  3. 2.3-lp1741165
  4. Merge into 2.3
Proposed by Newell Jensen
Status: Merged
Approved by: Newell Jensen
Approved revision: 25a4ccb8519980cf88afc809ba7e9e8c23e231c5
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~newell-jensen/maas:2.3-lp1741165
Merge into: maas:2.3
Diff against target: 42 lines (+6/-5)
2 files modified
src/provisioningserver/drivers/pod/tests/test_virsh.py (+1/-2)
src/provisioningserver/drivers/pod/virsh.py (+5/-3)
Reviewer Review Type Date Requested Status
Newell Jensen (community) Approve
Review via email: mp+340053@code.launchpad.net

Commit message

Backport of c5a810187578776c9dacf386d2628f23678a6aa2

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

To post a comment you must log in.
Revision history for this message
Newell Jensen (newell-jensen) wrote :

Self approved backport.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/drivers/pod/tests/test_virsh.py b/src/provisioningserver/drivers/pod/tests/test_virsh.py
2index c6a0247..473bc60 100644
3--- a/src/provisioningserver/drivers/pod/tests/test_virsh.py
4+++ b/src/provisioningserver/drivers/pod/tests/test_virsh.py
5@@ -1,4 +1,4 @@
6-# Copyright 2017 Canonical Ltd. This software is licensed under the
7+# Copyright 2017-2018 Canonical Ltd. This software is licensed under the
8 # GNU Affero General Public License version 3 (see the file LICENSE).
9
10 """Tests for `provisioningserver.drivers.pod.virsh`."""
11@@ -1032,7 +1032,6 @@ class TestVirshSSH(MAASTestCase):
12 call([
13 'undefine', domain,
14 '--remove-all-storage',
15- '--delete-snapshots',
16 '--managed-save'])))
17
18
19diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
20index a9b6775..e2de820 100644
21--- a/src/provisioningserver/drivers/pod/virsh.py
22+++ b/src/provisioningserver/drivers/pod/virsh.py
23@@ -1,4 +1,4 @@
24-# Copyright 2017 Canonical Ltd. This software is licensed under the
25+# Copyright 2017-2018 Canonical Ltd. This software is licensed under the
26 # GNU Affero General Public License version 3 (see the file LICENSE).
27
28 """Virsh pod driver."""
29@@ -771,9 +771,11 @@ class VirshSSH(pexpect.spawn):
30 # Ensure that its destroyed first.
31 self.run(['destroy', domain])
32 # Undefine the domains and remove all storage and snapshots.
33+ # XXX newell 2018-02-25 bug=1741165
34+ # Removed the --delete-snapshots flag to workaround the volumes not
35+ # being deleted. See the bug for more details.
36 self.run([
37- 'undefine', domain,
38- '--remove-all-storage', '--delete-snapshots', '--managed-save'])
39+ 'undefine', domain, '--remove-all-storage', '--managed-save'])
40
41
42 class VirshPodDriver(PodDriver):

Subscribers

People subscribed via source and target branches