MAAS

Merge ~skatsaounis/maas:lp-2048399-3.4-2 into maas:3.4

  1. Git
  2. lp:~skatsaounis/maas
  3. lp-2048399-3.4-2
  4. Merge into 3.4
Proposed by Stamatis Katsaounis
Status: Merged
Approved by: Stamatis Katsaounis
Approved revision: 9f3827fb5c21470c2449f7412eb2862ee318b953
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~skatsaounis/maas:lp-2048399-3.4-2
Merge into: maas:3.4
Diff against target: 30 lines (+4/-4)
2 files modified
src/metadataserver/tests/test_vendor_data.py (+2/-2)
src/metadataserver/vendor_data.py (+2/-2)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Stamatis Katsaounis Approve
Review via email: mp+460834@code.launchpad.net

Commit message

Use LTS channel for LXD installation on VM Hosts

(cherry picked from commit a6d3acace70c77906bc68e6b7bd13d03343d3c84)

To post a comment you must log in.
Revision history for this message
Stamatis Katsaounis (skatsaounis) wrote :

Self-approve backport

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp-2048399-3.4-2 lp:~skatsaounis/maas/+git/maas into -b 3.4 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 9f3827fb5c21470c2449f7412eb2862ee318b953

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/metadataserver/tests/test_vendor_data.py b/src/metadataserver/tests/test_vendor_data.py
2index a8272c7..dfa59d8 100644
3--- a/src/metadataserver/tests/test_vendor_data.py
4+++ b/src/metadataserver/tests/test_vendor_data.py
5@@ -462,8 +462,8 @@ class TestGenerateKVMPodConfiguration(MAASServerTestCase):
6 "runcmd",
7 [
8 "apt autoremove --purge --yes lxd lxd-client lxcfs",
9- "snap install lxd --channel=5.19/stable",
10- "snap refresh lxd --channel=5.19/stable",
11+ "snap install lxd --channel=5.21/stable",
12+ "snap refresh lxd --channel=5.21/stable",
13 "lxd init --auto --network-address=[::]",
14 "lxc project create maas",
15 "lxc config trust add /root/lxd.crt --restricted --projects maas",
16diff --git a/src/metadataserver/vendor_data.py b/src/metadataserver/vendor_data.py
17index d68f9b4..14711a1 100644
18--- a/src/metadataserver/vendor_data.py
19+++ b/src/metadataserver/vendor_data.py
20@@ -237,8 +237,8 @@ def generate_kvm_pod_configuration(node):
21 # installed by default in Focal.
22 yield "runcmd", [
23 "apt autoremove --purge --yes lxd lxd-client lxcfs",
24- "snap install lxd --channel=5.19/stable",
25- "snap refresh lxd --channel=5.19/stable",
26+ "snap install lxd --channel=5.21/stable",
27+ "snap refresh lxd --channel=5.21/stable",
28 "lxd init --auto --network-address=[::]",
29 f"lxc project create {maas_project}",
30 f"lxc config trust add {cert_file} --restricted --projects {maas_project}",

Subscribers

People subscribed via source and target branches