MAAS

Merge ~andreserl/maas:better_recommends into maas:master

  1. Git
  2. lp:~andreserl/maas
  3. better_recommends
  4. Merge into master
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 964696dc394d60f0086ea1a05b0d1ee78f868e54
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:better_recommends
Merge into: maas:master
Diff against target: 83 lines (+9/-8)
6 files modified
debian/control (+2/-1)
snap/snapcraft.yaml (+1/-1)
src/provisioningserver/drivers/pod/tests/test_virsh.py (+1/-1)
src/provisioningserver/drivers/pod/virsh.py (+2/-2)
src/provisioningserver/drivers/power/tests/test_virsh.py (+1/-1)
src/provisioningserver/drivers/power/virsh.py (+2/-2)
Reviewer Review Type Date Requested Status
Mike Pontillo (community) Approve
Review via email: mp+337813@code.launchpad.net

Commit message

LP: #1749757 - Use libvirt-clients instead of libvirt-bin

To post a comment you must log in.
Revision history for this message
Mike Pontillo (mpontillo) wrote :

Looks good; thanks for the quick fix!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/control b/debian/control
2index a1a5618..7a58f1c 100644
3--- a/debian/control
4+++ b/debian/control
5@@ -218,7 +218,8 @@ Depends: authbind,
6 wget,
7 ${misc:Depends},
8 ${python3:Depends}
9-Suggests: amtterm, ipmitool, libvirt-bin, nmap, wsmancli
10+Recommends: libvirt-clients
11+Suggests: amtterm, ipmitool, nmap, wsmancli
12 Conflicts: tftpd-hpa
13 Breaks: python-maas-provisioningserver,
14 maas-cluster-controller
15diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
16index 5ec42f5..ffb1c52 100644
17--- a/snap/snapcraft.yaml
18+++ b/snap/snapcraft.yaml
19@@ -39,7 +39,7 @@ parts:
20 - fence-agents # Fence CDU
21 - freeipmi-tools # IPMI
22 - ipmitool # Moonshot
23- - libvirt-bin # Virsh
24+ - libvirt-clients # Virsh
25 - archdetect-deb
26 - avahi-utils
27 - bind9
28diff --git a/src/provisioningserver/drivers/pod/tests/test_virsh.py b/src/provisioningserver/drivers/pod/tests/test_virsh.py
29index 7280d91..ba3a373 100644
30--- a/src/provisioningserver/drivers/pod/tests/test_virsh.py
31+++ b/src/provisioningserver/drivers/pod/tests/test_virsh.py
32@@ -1200,7 +1200,7 @@ class TestVirshPodDriver(MAASTestCase):
33 mock.return_value = False
34 driver = virsh_module.VirshPodDriver()
35 missing = driver.detect_missing_packages()
36- self.assertItemsEqual(['libvirt-bin'], missing)
37+ self.assertItemsEqual(['libvirt-clients'], missing)
38
39 def test_no_missing_packages(self):
40 mock = self.patch(has_command_available)
41diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
42index a2ece38..64dac66 100644
43--- a/src/provisioningserver/drivers/pod/virsh.py
44+++ b/src/provisioningserver/drivers/pod/virsh.py
45@@ -121,8 +121,8 @@ ARCH_FIX_REVERSE = {
46 }
47
48
49-REQUIRED_PACKAGES = [["virsh", "libvirt-bin"],
50- ["virt-login-shell", "libvirt-bin"]]
51+REQUIRED_PACKAGES = [["virsh", "libvirt-clients"],
52+ ["virt-login-shell", "libvirt-clients"]]
53
54
55 class VirshVMState:
56diff --git a/src/provisioningserver/drivers/power/tests/test_virsh.py b/src/provisioningserver/drivers/power/tests/test_virsh.py
57index 7404f00..b112ad0 100644
58--- a/src/provisioningserver/drivers/power/tests/test_virsh.py
59+++ b/src/provisioningserver/drivers/power/tests/test_virsh.py
60@@ -24,7 +24,7 @@ class TestVirshPowerDriver(MAASTestCase):
61 mock.return_value = False
62 driver = virsh_module.VirshPowerDriver()
63 missing = driver.detect_missing_packages()
64- self.assertItemsEqual(['libvirt-bin'], missing)
65+ self.assertItemsEqual(['libvirt-clients'], missing)
66
67 def test_no_missing_packages(self):
68 mock = self.patch(has_command_available)
69diff --git a/src/provisioningserver/drivers/power/virsh.py b/src/provisioningserver/drivers/power/virsh.py
70index 917f3cf..0bd1e93 100644
71--- a/src/provisioningserver/drivers/power/virsh.py
72+++ b/src/provisioningserver/drivers/power/virsh.py
73@@ -19,8 +19,8 @@ from provisioningserver.drivers.power import PowerDriver
74 from provisioningserver.utils import shell
75
76
77-REQUIRED_PACKAGES = [["virsh", "libvirt-bin"],
78- ["virt-login-shell", "libvirt-bin"]]
79+REQUIRED_PACKAGES = [["virsh", "libvirt-clients"],
80+ ["virt-login-shell", "libvirt-clients"]]
81
82
83 def extract_virsh_parameters(context):

Subscribers

People subscribed via source and target branches