Merge ~skatsaounis/maas:lp-2048399-3.4-2 into maas: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
diff --git a/src/metadataserver/tests/test_vendor_data.py b/src/metadataserver/tests/test_vendor_data.py
index a8272c7..dfa59d8 100644
--- a/src/metadataserver/tests/test_vendor_data.py
+++ b/src/metadataserver/tests/test_vendor_data.py
@@ -462,8 +462,8 @@ class TestGenerateKVMPodConfiguration(MAASServerTestCase):
462 "runcmd",462 "runcmd",
463 [463 [
464 "apt autoremove --purge --yes lxd lxd-client lxcfs",464 "apt autoremove --purge --yes lxd lxd-client lxcfs",
465 "snap install lxd --channel=5.19/stable",465 "snap install lxd --channel=5.21/stable",
466 "snap refresh lxd --channel=5.19/stable",466 "snap refresh lxd --channel=5.21/stable",
467 "lxd init --auto --network-address=[::]",467 "lxd init --auto --network-address=[::]",
468 "lxc project create maas",468 "lxc project create maas",
469 "lxc config trust add /root/lxd.crt --restricted --projects maas",469 "lxc config trust add /root/lxd.crt --restricted --projects maas",
diff --git a/src/metadataserver/vendor_data.py b/src/metadataserver/vendor_data.py
index d68f9b4..14711a1 100644
--- a/src/metadataserver/vendor_data.py
+++ b/src/metadataserver/vendor_data.py
@@ -237,8 +237,8 @@ def generate_kvm_pod_configuration(node):
237 # installed by default in Focal.237 # installed by default in Focal.
238 yield "runcmd", [238 yield "runcmd", [
239 "apt autoremove --purge --yes lxd lxd-client lxcfs",239 "apt autoremove --purge --yes lxd lxd-client lxcfs",
240 "snap install lxd --channel=5.19/stable",240 "snap install lxd --channel=5.21/stable",
241 "snap refresh lxd --channel=5.19/stable",241 "snap refresh lxd --channel=5.21/stable",
242 "lxd init --auto --network-address=[::]",242 "lxd init --auto --network-address=[::]",
243 f"lxc project create {maas_project}",243 f"lxc project create {maas_project}",
244 f"lxc config trust add {cert_file} --restricted --projects {maas_project}",244 f"lxc config trust add {cert_file} --restricted --projects {maas_project}",

Subscribers

People subscribed via source and target branches