Merge ~mfo/maas:2.9 into maas:2.9

[Mauricio Faria de Oliveira]

Please ignore; this is only for testing.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 2.9 lp:~mfo/maas/+git/maas into -b 2.9 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/2692/console
COMMIT: 9feb47e7506138d130d04f6da345b70beedac0a5

review: Needs Fixing

[Mauricio Faria de Oliveira (mfo)]

UNIT TESTS: pass

http://maas-ci.internal:8080/job/maas-tester/2700/

Test Result (no failures)

0 failures,
22 skipped
17,551 tests

diff --git a/debian/changelog b/debian/changelog
index 64f9a3c..f3f1f89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,16 @@
+maas (1:2.9.3~rc2-0ubuntu1) lunar; urgency=medium
+
+  * New upstream release, MAAS 2.9.3 RC2.
+  * Reapply 2.8.x fixes since MAAS 2.9.2.
+
+ -- Mauricio Faria de Oliveira <[e-mail]>  Wed, 07 Jun 2023 17:12:21 -0300
+
 maas (1:2.9.3~rc1-0ubuntu1) focal; urgency=medium
 
   * New upstream release, MAAS 2.9.3 RC1.
+  * Reapply SE fixes since MAAS 2.9.2.
+  * Reapply ui fixes since MAAS 2.9.2 and more
+    with maas-ui update to top of 2.9 branch.
 
  -- Mauricio Faria de Oliveira <[e-mail]>  Tue, 06 Jun 2023 21:13:12 -0300
 
diff --git a/setup.py b/setup.py
index 6489e5e..24751ce 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ def read(filename):
 
 setup(
     name="maas",
-    version="2.9.3rc1",
+    version="2.9.3rc2",
     url="https://maas.io/",
     license="AGPLv3",
     description="Metal As A Service",
diff --git a/snap/local/tree/bin/maas-deb-migrate b/snap/local/tree/bin/maas-deb-migrate
index febca85..f646f0f 100755
--- a/snap/local/tree/bin/maas-deb-migrate
+++ b/snap/local/tree/bin/maas-deb-migrate
@@ -65,17 +65,21 @@ cleanup_data() {
 }
 
 apply_db_patches() {
-    if maas_snap_mode | grep -q "region"; then
-        snap_run "maas-region migrate"
+    if ! maas_snap_mode | grep -q "region"; then
+        return
     fi
 
+    snap_run "maas-region migrate"
     # patch the value of the default cloud images keyring to point to the one
     # in the snap
-    local keyring="/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg"
-    cat <<EOF | pg_do psql maasdb
-UPDATE maasserver_bootsource
-SET keyring_filename = '${MAAS_SNAP}${keyring}'
-WHERE keyring_filename = '${keyring}'
+    cat <<EOF | snap_run "maas-region shell"
+from maasserver.models import BootSource
+keyring = "/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg"
+(
+ BootSource.objects
+ .filter(keyring_filename=keyring)
+ .update(keyring_filename=f"/snap/maas/current{keyring}")
+)
 EOF
 }
 
diff --git a/src/maasserver/models/interface.py b/src/maasserver/models/interface.py
index b7738dc..b5d9625 100644
--- a/src/maasserver/models/interface.py
+++ b/src/maasserver/models/interface.py
@@ -111,7 +111,7 @@ class InterfaceQueriesMixin(MAASQueriesMixin):
             specifiers,
             specifier_types=specifier_types,
             separator=separator,
-            **kwargs
+            **kwargs,
         )
 
     def _add_interface_id_query(self, current_q, op, item):
@@ -1522,20 +1522,10 @@ class Interface(CleanSave, TimestampedModel):
                     % (self.get_log_string(), vid, vlan.fabric.get_name())
                 )
 
-    def update_neighbour(self, neighbour_json: dict):
-        """Updates the neighbour table for this interface.
-
-        Input is expected to be the neighbour JSON from the controller.
-        """
-        # Circular imports
+    def update_neighbour(self, ip, mac, time, vid=None):
+        """Updates the neighbour table for this interface."""
         from maasserver.models.neighbour import Neighbour
 
-        if self.neighbour_discovery_state is False:
-            return None
-        ip = neighbour_json["ip"]
-        mac = neighbour_json["mac"]
-        time = neighbour_json["time"]
-        vid = neighbour_json.get("vid", None)
         deleted = Neighbour.objects.delete_and_log_obsolete_neighbours(
             ip, mac, interface=self, vid=vid
         )
@@ -1552,13 +1542,10 @@ class Interface(CleanSave, TimestampedModel):
             # generated a log statement about this neighbour.
             if not deleted:
                 maaslog.info(
-                    "%s: New MAC, IP binding observed%s: %s, %s"
-                    % (
-                        self.get_log_string(),
-                        Neighbour.objects.get_vid_log_snippet(vid),
-                        mac,
-                        ip,
-                    )
+                    f"{self.get_log_string()}: "
+                    "New MAC, IP binding "
+                    f"observed{Neighbour.objects.get_vid_log_snippet(vid)}: "
+                    f"{mac}, {ip}"
                 )
         else:
             neighbour.time = time
diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index 5d506b4..48852de 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -4337,9 +4337,11 @@ class Node(CleanSave, TimestampedModel):
                     bridge_fd=bridge_fd,
                 )
 
-    def claim_auto_ips(self, temp_expires_after=None):
+    def claim_auto_ips(self, exclude_addresses=None, temp_expires_after=None):
         """Assign IP addresses to all interface links set to AUTO."""
-        exclude_addresses = set()
+        exclude_addresses = (
+            exclude_addresses.copy() if exclude_addresses else set()
+        )
         allocated_ips = set()
         # Query for the interfaces again here; if we use the cached
         # interface_set, we could skip a newly-created bridge if it was created
@@ -4480,11 +4482,9 @@ class Node(CleanSave, TimestampedModel):
                             rack_interface = rack_interface.order_by("id")
                             rack_interface = rack_interface.first()
                             rack_interface.update_neighbour(
-                                {
-                                    "ip": ip_obj.ip,
-                                    "mac": ip_result.get("mac_address"),
-                                    "time": time.time(),
-                                }
+                                ip_obj.ip,
+                                ip_result.get("mac_address"),
+                                time.time(),
                             )
                             ip_obj.ip = None
                             ip_obj.temp_expires_on = None
@@ -4502,6 +4502,7 @@ class Node(CleanSave, TimestampedModel):
             yield deferToDatabase(clean_expired)
             allocated_ips = yield deferToDatabase(
                 transactional(self.claim_auto_ips),
+                exclude_addresses=attempted_ips,
                 temp_expires_after=timedelta(minutes=5),
             )
             if not allocated_ips:
@@ -6723,8 +6724,14 @@ class Controller(Node):
         for neighbour in neighbours:
             interface = interfaces.get(neighbour["interface"], None)
             if interface is not None:
-                interface.update_neighbour(neighbour)
                 vid = neighbour.get("vid", None)
+                if interface.neighbour_discovery_state:
+                    interface.update_neighbour(
+                        neighbour["ip"],
+                        neighbour["mac"],
+                        neighbour["time"],
+                        vid=vid,
+                    )
                 if vid is not None:
                     interface.report_vid(vid)
 
diff --git a/src/maasserver/models/tests/test_interface.py b/src/maasserver/models/tests/test_interface.py
index b86dbfb..ee16f56 100644
--- a/src/maasserver/models/tests/test_interface.py
+++ b/src/maasserver/models/tests/test_interface.py
@@ -1363,7 +1363,7 @@ class InterfaceTest(MAASServerTestCase):
         self.assertEquals(0, interface.link_speed)
 
 
-class InterfaceUpdateNeighbourTest(MAASServerTestCase):
+class TestInterfaceUpdateNeighbour(MAASServerTestCase):
     """Tests for `Interface.update_neighbour`."""
 
     def make_neighbour_json(self, ip=None, mac=None, time=None, **kwargs):
@@ -1384,22 +1384,15 @@ class InterfaceUpdateNeighbourTest(MAASServerTestCase):
                 vid = None
         return {"ip": ip, "mac": mac, "time": time, "vid": vid}
 
-    def test_ignores_updates_if_neighbour_discovery_state_is_false(self):
+    def test_adds_new_neighbour(self):
         iface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
-        iface.update_neighbour(self.make_neighbour_json())
-        self.assertThat(Neighbour.objects.count(), Equals(0))
-
-    def test_adds_new_neighbour_if_neighbour_discovery_state_is_true(self):
-        iface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
-        iface.neighbour_discovery_state = True
-        iface.update_neighbour(self.make_neighbour_json())
+        iface.update_neighbour(**self.make_neighbour_json())
         self.assertThat(Neighbour.objects.count(), Equals(1))
 
     def test_updates_existing_neighbour(self):
         iface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
-        iface.neighbour_discovery_state = True
         json = self.make_neighbour_json()
-        iface.update_neighbour(json)
+        iface.update_neighbour(**json)
         neighbour = get_one(Neighbour.objects.all())
         # Pretend this was updated one day ago.
         yesterday = datetime.datetime.now() - datetime.timedelta(days=1)
@@ -1410,7 +1403,7 @@ class InterfaceUpdateNeighbourTest(MAASServerTestCase):
             Equals(int(yesterday.timestamp())),
         )
         json["time"] += 1
-        iface.update_neighbour(json)
+        iface.update_neighbour(**json)
         neighbour = reload_object(neighbour)
         self.assertThat(Neighbour.objects.count(), Equals(1))
         self.assertThat(neighbour.time, Equals(json["time"]))
@@ -1422,13 +1415,12 @@ class InterfaceUpdateNeighbourTest(MAASServerTestCase):
 
     def test_replaces_obsolete_neighbour(self):
         iface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
-        iface.neighbour_discovery_state = True
         json = self.make_neighbour_json()
-        iface.update_neighbour(json)
+        iface.update_neighbour(**json)
         # Have a different MAC address claim ownership of the IP.
         json["time"] += 1
         json["mac"] = factory.make_mac_address()
-        iface.update_neighbour(json)
+        iface.update_neighbour(**json)
         self.assertThat(Neighbour.objects.count(), Equals(1))
         self.assertThat(
             list(Neighbour.objects.all())[0].mac_address, Equals(json["mac"])
@@ -1439,10 +1431,8 @@ class InterfaceUpdateNeighbourTest(MAASServerTestCase):
 
     def test_logs_new_binding(self):
         iface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
-        iface.neighbour_discovery_state = True
-        json = self.make_neighbour_json()
         with FakeLogger("maas.interface") as maaslog:
-            iface.update_neighbour(json)
+            iface.update_neighbour(**self.make_neighbour_json())
         self.assertDocTestMatches(
             "...: New MAC, IP binding observed...", maaslog.output
         )
@@ -1451,18 +1441,18 @@ class InterfaceUpdateNeighbourTest(MAASServerTestCase):
         iface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         iface.neighbour_discovery_state = True
         json = self.make_neighbour_json()
-        iface.update_neighbour(json)
+        iface.update_neighbour(**json)
         # Have a different MAC address claim ownership of the IP.
         json["time"] += 1
         json["mac"] = factory.make_mac_address()
         with FakeLogger("maas.neighbour") as maaslog:
-            iface.update_neighbour(json)
+            iface.update_neighbour(**json)
         self.assertDocTestMatches(
             "...: IP address...moved from...to...", maaslog.output
         )
 
 
-class InterfaceUpdateMDNSEntryTest(MAASServerTestCase):
+class TestInterfaceUpdateMDNSEntry(MAASServerTestCase):
     """Tests for `Interface.update_mdns_entry`."""
 
     def make_mdns_entry_json(self, ip=None, hostname=None):
@@ -1477,7 +1467,7 @@ class InterfaceUpdateMDNSEntryTest(MAASServerTestCase):
 
     def test_ignores_updates_if_mdns_discovery_state_is_false(self):
         iface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
-        iface.update_neighbour(self.make_mdns_entry_json())
+        iface.update_mdns_entry(self.make_mdns_entry_json())
         self.assertThat(MDNS.objects.count(), Equals(0))
 
     def test_adds_new_entry_if_mdns_discovery_state_is_true(self):
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index a5a5aa7..61f1fe6 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -79,6 +79,7 @@ from maasserver.exceptions import (
     StaticIPAddressExhaustion,
 )
 from maasserver.models import (
+    BMCRoutableRackControllerRelationship,
     BondInterface,
     BootResource,
     BridgeInterface,
@@ -86,11 +87,13 @@ from maasserver.models import (
     Controller,
     Device,
     Domain,
+    Event,
     EventType,
     Fabric,
     Interface,
     LicenseKey,
     Machine,
+    Neighbour,
     Node,
 )
 from maasserver.models import (
@@ -100,6 +103,7 @@ from maasserver.models import (
     RAID,
     RegionController,
     RegionRackRPCConnection,
+    ResourcePool,
     Service,
     StaticIPAddress,
     Subnet,
@@ -108,12 +112,10 @@ from maasserver.models import (
     VLANInterface,
     VolumeGroup,
 )
-from maasserver.models import Bcache
+from maasserver.models import Bcache, BMC
 from maasserver.models import bmc as bmc_module
 from maasserver.models import node as node_module
-from maasserver.models.bmc import BMC, BMCRoutableRackControllerRelationship
 from maasserver.models.config import NetworkDiscoveryConfig
-from maasserver.models.event import Event
 import maasserver.models.interface as interface_module
 from maasserver.models.node import (
     DEFAULT_BIOS_BOOT_METHOD,
@@ -123,7 +125,6 @@ from maasserver.models.node import (
     PowerInfo,
 )
 from maasserver.models.partitiontable import PARTITION_TABLE_EXTRA_SPACE
-from maasserver.models.resourcepool import ResourcePool
 from maasserver.models.signals import power as node_query
 from maasserver.models.timestampedmodel import now
 from maasserver.node_status import (
@@ -8694,6 +8695,74 @@ class TestNode_Start(MAASTransactionServerTestCase):
         self.assertThat(auto_ip.ip, Equals(third_ip.ip))
         self.assertThat(auto_ip.temp_expires_on, Is(None))
 
+    def test_claims_auto_ip_addresses_skips_used_ip_discovery_disabled(self):
+        user = factory.make_User()
+        node = self.make_acquired_node_with_interface(
+            user, power_type="manual"
+        )
+        node_interface = node.get_boot_interface()
+        [auto_ip] = node_interface.ip_addresses.filter(
+            alloc_type=IPADDRESS_TYPE.AUTO
+        )
+
+        # Create a rack controller that has an interface on the same subnet
+        # as the node. Don't enable neighbour discovery
+        rack = factory.make_RackController()
+        rack.interface_set.all().delete()
+        rackif = factory.make_Interface(vlan=node_interface.vlan, node=rack)
+        rackif_ip = factory.pick_ip_in_Subnet(auto_ip.subnet)
+        rackif.link_subnet(
+            INTERFACE_LINK_TYPE.STATIC, auto_ip.subnet, rackif_ip
+        )
+
+        # Mock the rack controller connected to the region controller.
+        client = Mock()
+        client.ident = rack.system_id
+        self.patch(node_module, "getAllClients").return_value = [client]
+
+        # Must be executed in a transaction as `allocate_new` uses savepoints.
+        with transaction.atomic():
+            # Get two IPs and remove them so they're unknown
+            ip = StaticIPAddress.objects.allocate_new(
+                subnet=auto_ip.subnet, alloc_type=IPADDRESS_TYPE.AUTO
+            )
+            ip1 = ip.ip
+            ip.delete()
+            ip = StaticIPAddress.objects.allocate_new(
+                subnet=auto_ip.subnet,
+                alloc_type=IPADDRESS_TYPE.AUTO,
+                exclude_addresses=[ip1],
+            )
+            ip2 = ip.ip
+            ip.delete()
+
+        client.side_effect = [
+            defer.succeed(
+                {
+                    "ip_addresses": [
+                        {
+                            "ip_address": ip1,
+                            "used": True,
+                            "mac_address": factory.make_mac_address(),
+                        }
+                    ]
+                }
+            ),
+            defer.succeed(
+                {"ip_addresses": [{"ip_address": ip2, "used": False}]}
+            ),
+        ]
+
+        with post_commit_hooks:
+            node.start(user)
+
+        auto_ip = reload_object(auto_ip)
+        self.assertThat(auto_ip.ip, Equals(ip2))
+        self.assertThat(auto_ip.temp_expires_on, Is(None))
+        self.assertCountEqual(
+            [ip1], Neighbour.objects.values_list("ip", flat=True)
+        )
+
     def test_claims_auto_ip_addresses_retries_on_failure_from_rack(self):
         user = factory.make_User()
         node = self.make_acquired_node_with_interface(
@@ -9914,21 +9983,51 @@ class TestControllerUpdateDiscoveryState(MAASServerTestCase):
 class TestReportNeighbours(MAASServerTestCase):
     """Tests for `Controller.report_neighbours()."""
 
-    def test_calls_update_neighbour_for_each_neighbour(self):
+    def test_no_update_neighbours_calls_if_discovery_disabled(self):
         rack = factory.make_RackController()
         factory.make_Interface(name="eth0", node=rack)
-        factory.make_Interface(name="eth1", node=rack)
         update_neighbour = self.patch(
             interface_module.Interface, "update_neighbour"
         )
         neighbours = [
-            {"interface": "eth0", "mac": factory.make_mac_address()},
-            {"interface": "eth1", "mac": factory.make_mac_address()},
+            {
+                "interface": "eth0",
+                "mac": factory.make_mac_address(),
+                "ip": factory.make_ipv4_address(),
+                "time": datetime.now(),
+            },
+        ]
+        rack.report_neighbours(neighbours)
+        update_neighbour.assert_not_called()
+
+    def test_calls_update_neighbour_for_each_neighbour(self):
+        rack = factory.make_RackController()
+        if1 = factory.make_Interface(name="eth0", node=rack)
+        if1.neighbour_discovery_state = True
+        if1.save()
+        if2 = factory.make_Interface(name="eth1", node=rack)
+        if2.neighbour_discovery_state = True
+        if2.save()
+        update_neighbour = self.patch(
+            interface_module.Interface, "update_neighbour"
+        )
+        neighbours = [
+            {
+                "interface": "eth0",
+                "mac": factory.make_mac_address(),
+                "ip": factory.make_ipv4_address(),
+                "time": datetime.now(),
+            },
+            {
+                "interface": "eth1",
+                "mac": factory.make_mac_address(),
+                "ip": factory.make_ipv4_address(),
+                "time": datetime.now(),
+            },
         ]
         rack.report_neighbours(neighbours)
-        self.assertThat(
-            update_neighbour,
-            MockCallsMatch(*[call(neighbour) for neighbour in neighbours]),
+        update_neighbour.assert_has_calls(
+            [call(n["ip"], n["mac"], n["time"], vid=None) for n in neighbours]
         )
 
     def test_calls_report_vid_for_each_vid(self):
@@ -9939,11 +10038,23 @@ class TestReportNeighbours(MAASServerTestCase):
         self.patch(interface_module.Interface, "update_neighbour")
         report_vid = self.patch(interface_module.Interface, "report_vid")
         neighbours = [
-            {"interface": "eth0", "mac": factory.make_mac_address(), "vid": 3},
-            {"interface": "eth1", "mac": factory.make_mac_address(), "vid": 7},
+            {
+                "interface": "eth0",
+                "ip": factory.make_ipv4_address(),
+                "time": datetime.now(),
+                "mac": factory.make_mac_address(),
+                "vid": 3,
+            },
+            {
+                "interface": "eth1",
+                "ip": factory.make_ipv4_address(),
+                "time": datetime.now(),
+                "mac": factory.make_mac_address(),
+                "vid": 7,
+            },
         ]
         rack.report_neighbours(neighbours)
-        self.assertThat(report_vid, MockCallsMatch(call(3), call(7)))
+        report_vid.assert_has_calls([call(3), call(7)])
 
 
 class TestReportMDNSEntries(MAASServerTestCase):
diff --git a/src/maasserver/websockets/handlers/pod.py b/src/maasserver/websockets/handlers/pod.py
index bfe3676..686f9a9 100644
--- a/src/maasserver/websockets/handlers/pod.py
+++ b/src/maasserver/websockets/handlers/pod.py
@@ -97,33 +97,37 @@ class PodHandler(TimestampedModelHandler):
         """Add extra fields to `data`."""
         if self.user.is_superuser:
             data.update(obj.power_parameters)
-        data["type"] = obj.power_type
-        data["total"] = self.dehydrate_total(obj)
-        data["used"] = self.dehydrate_used(obj)
-        data["available"] = self.dehydrate_available(obj)
-        data["composed_machines_count"] = obj.node_set.filter(
-            node_type=NODE_TYPE.MACHINE
-        ).count()
-        data["owners_count"] = (
-            obj.node_set.exclude(owner=None)
-            .values_list("owner")
-            .distinct()
-            .count()
+        data.update(
+            {
+                "type": obj.power_type,
+                "total": self.dehydrate_total(obj),
+                "used": self.dehydrate_used(obj),
+                "available": self.dehydrate_available(obj),
+                "composed_machines_count": obj.node_set.filter(
+                    node_type=NODE_TYPE.MACHINE
+                ).count(),
+                "owners_count": (
+                    obj.node_set.exclude(owner=None)
+                    .values_list("owner")
+                    .distinct()
+                    .count()
+                ),
+                "hints": self.dehydrate_hints(obj.hints),
+                "storage_pools": [
+                    self.dehydrate_storage_pool(pool)
+                    for pool in obj.storage_pools.all()
+                ],
+                "default_storage_pool": (
+                    obj.default_storage_pool.pool_id
+                    if obj.default_storage_pool
+                    else None
+                ),
+                "host": obj.host.system_id if obj.host else None,
+                "numa_pinning": self.dehydrate_numa_pinning(obj),
+            }
         )
-        data["hints"] = self.dehydrate_hints(obj.hints)
-        storage_pools = obj.storage_pools.all()
-        if len(storage_pools) > 0:
-            pools_data = []
-            for pool in storage_pools:
-                pools_data.append(self.dehydrate_storage_pool(pool))
-            data["storage_pools"] = pools_data
-            data["default_storage_pool"] = obj.default_storage_pool.pool_id
-        if obj.host is not None:
-            data["host"] = obj.host.system_id
-        else:
-            data["host"] = None
         if not for_list:
-            if obj.host is not None:
+            if obj.host:
                 data["attached_vlans"] = list(
                     obj.host.interface_set.all().values_list(
                         "vlan_id", flat=True
@@ -141,8 +145,6 @@ class PodHandler(TimestampedModelHandler):
                 data["attached_vlans"] = []
                 data["boot_vlans"] = []
 
-        data["numa_pinning"] = self.dehydrate_numa_pinning(obj)
-
         if self.user.has_perm(PodPermission.compose, obj):
             data["permissions"].append("compose")
 
diff --git a/src/maasserver/websockets/handlers/tests/test_pod.py b/src/maasserver/websockets/handlers/tests/test_pod.py
index 6137c38..f4e857f 100644
--- a/src/maasserver/websockets/handlers/tests/test_pod.py
+++ b/src/maasserver/websockets/handlers/tests/test_pod.py
@@ -14,6 +14,7 @@ from twisted.internet.defer import inlineCallbacks, succeed
 from maasserver.enum import INTERFACE_TYPE
 from maasserver.forms import pods
 from maasserver.forms.pods import PodForm
+from maasserver.models import PodStoragePool
 from maasserver.models.virtualmachine import MB, VirtualMachineInterface
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASTransactionServerTestCase
@@ -226,6 +227,21 @@ class TestPodHandler(MAASTransactionServerTestCase):
             ],
         )
 
+    def test_get_with_pod_host_no_storage_pools(self):
+        admin = factory.make_admin()
+        handler = PodHandler(admin, {}, None)
+        node = factory.make_Node()
+        pod = self.make_pod_with_hints(
+            pod_type="lxd",
+            host=node,
+        )
+        pod.default_storage_pool = None
+        pod.save()
+        PodStoragePool.objects.all().delete()
+        result = handler.get({"id": pod.id})
+        self.assertIsNone(result["default_storage_pool"])
+        self.assertEqual(result["storage_pools"], [])
+
     def test_get_host_interfaces_no_sriov(self):
         admin = factory.make_admin()
         handler = PodHandler(admin, {}, None)
diff --git a/src/provisioningserver/__main__.py b/src/provisioningserver/__main__.py
index 6cf81d9..5f22393 100644
--- a/src/provisioningserver/__main__.py
+++ b/src/provisioningserver/__main__.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2012-2017 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Command-line interface for the MAAS provisioning component."""
@@ -7,7 +7,6 @@
 import sys
 
 from provisioningserver import security
-import provisioningserver.boot.install_grub
 import provisioningserver.cluster_config_command
 import provisioningserver.dns.commands.edit_named_options
 import provisioningserver.dns.commands.get_named_conf
@@ -39,7 +38,6 @@ RACK_ONLY_COMMANDS = {
     "check-for-shared-secret": security.CheckForSharedSecretScript,
     "config": provisioningserver.cluster_config_command,
     "install-shared-secret": security.InstallSharedSecretScript,
-    "install-uefi-config": provisioningserver.boot.install_grub,
     "register": provisioningserver.register_command,
     "support-dump": provisioningserver.support_dump,
     "upgrade-cluster": provisioningserver.upgrade_cluster,
diff --git a/src/provisioningserver/boot/__init__.py b/src/provisioningserver/boot/__init__.py
index d4b13e2..5c4f4b6 100644
--- a/src/provisioningserver/boot/__init__.py
+++ b/src/provisioningserver/boot/__init__.py
@@ -17,6 +17,7 @@ from twisted.internet.defer import inlineCallbacks, returnValue
 from zope.interface import implementer
 
 from provisioningserver.boot.tftppath import compose_image_path
+from provisioningserver.config import debug_enabled
 from provisioningserver.events import EVENT_TYPES, try_send_rack_event
 from provisioningserver.kernel_opts import compose_kernel_command_line
 from provisioningserver.logger import get_maas_logger
@@ -418,6 +419,7 @@ class BootMethod(metaclass=ABCMeta):
             "kernel_path": kernel_path,
             "kernel_name": kernel_name,
             "dtb_path": dtb_path,
+            "debug": debug_enabled(),
         }
 
         return namespace
diff --git a/src/provisioningserver/boot/install_grub.py b/src/provisioningserver/boot/install_grub.py
deleted file mode 100644
index 27ebd36..0000000
--- a/src/provisioningserver/boot/install_grub.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Install a GRUB2 pre-boot loader config for TFTP download."""
-
-
-import os
-
-from provisioningserver.config import ClusterConfiguration
-from provisioningserver.utils.fs import write_text_file
-
-CONFIG_FILE = """
-# MAAS GRUB2 pre-loader configuration file
-
-# Load based on MAC address first.
-configfile /grub/grub.cfg-${net_default_mac}
-
-# Failed to load based on MAC address.
-# Load amd64 by default, UEFI only supported by 64-bit
-configfile /grub/grub.cfg-default-amd64
-"""
-
-
-def add_arguments(parser):
-    pass
-
-
-def run(args):
-    """Install a GRUB2 pre-boot loader config into the TFTP
-    directory structure.
-    """
-    with ClusterConfiguration.open() as config:
-        if not os.path.exists(config.grub_root):
-            os.makedirs(config.grub_root)
-        destination_file = os.path.join(config.grub_root, "grub.cfg")
-    write_text_file(destination_file, CONFIG_FILE)
diff --git a/src/provisioningserver/boot/tests/test_boot.py b/src/provisioningserver/boot/tests/test_boot.py
index 7e591ce..f5711ec 100644
--- a/src/provisioningserver/boot/tests/test_boot.py
+++ b/src/provisioningserver/boot/tests/test_boot.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `provisioningserver.boot`."""
@@ -30,6 +30,7 @@ from provisioningserver.boot.tftppath import compose_image_path
 from provisioningserver.kernel_opts import compose_kernel_command_line
 from provisioningserver.rpc import region
 from provisioningserver.rpc.testing import MockLiveClusterToRegionRPCFixture
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.tests.test_kernel_opts import make_kernel_parameters
 from provisioningserver.utils.fs import atomic_symlink, tempdir
 
@@ -331,6 +332,18 @@ class TestBootMethod(MAASTestCase):
             template_namespace["dtb_path"](kernel_params),
         )
 
+    def test_compose_template_namespace_include_debug(self):
+        debug = factory.pick_bool()
+        boot.debug_enabled.cache_clear()
+        self.addClassCleanup(boot.debug_enabled.cache_clear)
+        self.useFixture(ClusterConfigurationFixture(debug=debug))
+        kernel_params = make_kernel_parameters()
+        method = FakeBootMethod()
+
+        template_namespace = method.compose_template_namespace(kernel_params)
+
+        self.assertEqual(debug, template_namespace["debug"])
+
 
 class TestGetArchiveUrl(MAASTestCase):
 
diff --git a/src/provisioningserver/boot/tests/test_install_grub.py b/src/provisioningserver/boot/tests/test_install_grub.py
deleted file mode 100644
index 6cb876f..0000000
--- a/src/provisioningserver/boot/tests/test_install_grub.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Tests for the install_grub command."""
-
-
-import os.path
-
-from testtools.matchers import FileExists
-
-from maastesting.factory import factory
-from maastesting.testcase import MAASTestCase
-import provisioningserver.boot.install_grub
-from provisioningserver.testing.config import ClusterConfigurationFixture
-from provisioningserver.utils.script import MainScript
-
-
-class TestInstallGrub(MAASTestCase):
-    def test_integration(self):
-        tftproot = self.make_dir()
-        self.useFixture(ClusterConfigurationFixture(tftp_root=tftproot))
-
-        action = factory.make_name("action")
-        script = MainScript(action)
-        script.register(action, provisioningserver.boot.install_grub)
-        script.execute((action,))
-
-        config_filename = os.path.join("grub", "grub.cfg")
-        self.assertThat(os.path.join(tftproot, config_filename), FileExists())
diff --git a/src/provisioningserver/boot/tests/test_uefi_amd64.py b/src/provisioningserver/boot/tests/test_uefi_amd64.py
index 328e7dd..886dca5 100644
--- a/src/provisioningserver/boot/tests/test_uefi_amd64.py
+++ b/src/provisioningserver/boot/tests/test_uefi_amd64.py
@@ -1,10 +1,11 @@
-# Copyright 2014-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `provisioningserver.boot.uefi_amd64`."""
 
 
 import os
+import random
 import re
 from unittest.mock import sentinel
 
@@ -19,6 +20,7 @@ from testtools.matchers import (
 from maastesting.factory import factory
 from maastesting.matchers import FileContains, MockAnyCall, MockCalledOnce
 from maastesting.testcase import MAASTestCase
+from provisioningserver import boot
 from provisioningserver.boot import BytesReader
 from provisioningserver.boot import uefi_amd64 as uefi_amd64_module
 from provisioningserver.boot.testing import TFTPPath, TFTPPathAndComponents
@@ -29,6 +31,7 @@ from provisioningserver.boot.uefi_amd64 import (
     UEFIAMD64BootMethod,
     UEFIAMD64HTTPBootMethod,
 )
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.tests.test_kernel_opts import make_kernel_parameters
 from provisioningserver.utils import typed
 from provisioningserver.utils.fs import tempdir
@@ -68,6 +71,12 @@ class TestUEFIAMD64BootMethodRender(MAASTestCase):
     """Tests for
     `provisioningserver.boot_amd64.uefi.UEFIAMD64BootMethod.render`."""
 
+    def setUp(self):
+        super().setUp()
+        boot.debug_enabled.cache_clear()
+        self.addClassCleanup(boot.debug_enabled.cache_clear)
+        self.useFixture(ClusterConfigurationFixture(debug=False))
+
     def test_get_reader(self):
         # Given the right configuration options, the UEFI configuration is
         # correctly rendered.
@@ -101,7 +110,7 @@ class TestUEFIAMD64BootMethodRender(MAASTestCase):
                     re.MULTILINE | re.DOTALL,
                 ),
                 MatchesRegex(
-                    r".*^\s+linuxefi  %s/%s/%s .+?$"
+                    r".*^\s+linux  %s/%s/%s .+?$"
                     % (
                         re.escape(fs_host),
                         re.escape(image_dir),
@@ -110,7 +119,7 @@ class TestUEFIAMD64BootMethodRender(MAASTestCase):
                     re.MULTILINE | re.DOTALL,
                 ),
                 MatchesRegex(
-                    r".*^\s+initrdefi %s/%s/%s$"
+                    r".*^\s+initrd %s/%s/%s$"
                     % (
                         re.escape(fs_host),
                         re.escape(image_dir),
@@ -126,7 +135,7 @@ class TestUEFIAMD64BootMethodRender(MAASTestCase):
         method = UEFIAMD64BootMethod()
         options = {
             "backend": None,
-            "kernel_params": make_kernel_parameters(purpose="install"),
+            "kernel_params": make_kernel_parameters(purpose="xinstall"),
         }
         # Capture the output before sprinking in some random options.
         output_before = method.get_reader(**options).read(10000)
@@ -167,7 +176,7 @@ class TestUEFIAMD64BootMethodRender(MAASTestCase):
             output,
             ContainsAll(
                 [
-                    "menuentry 'Enlist'",
+                    "menuentry 'Ephemeral'",
                     "%s/%s/%s" % (params.osystem, params.arch, params.subarch),
                     params.kernel,
                 ]
@@ -185,7 +194,7 @@ class TestUEFIAMD64BootMethodRender(MAASTestCase):
             output,
             ContainsAll(
                 [
-                    "menuentry 'Commission'",
+                    "menuentry 'Ephemeral'",
                     "%s/%s/%s" % (params.osystem, params.arch, params.subarch),
                     params.kernel,
                 ]
@@ -261,6 +270,8 @@ class TestUEFIAMD64BootMethodRegex(MAASTestCase):
         )
 
     def test_re_config_file_does_not_match_default_grub_config_file(self):
+        # The default grub.cfg is on the filesystem let the normal handler
+        # grab it.
         self.assertIsNone(re_config_file.match(b"grub/grub.cfg"))
 
     def test_re_config_file_with_default(self):
@@ -293,6 +304,86 @@ class TestUEFIAMD64BootMethodRegex(MAASTestCase):
 class TestUEFIAMD64BootMethod(MAASTestCase):
     """Tests `provisioningserver.boot.uefi_amd64.UEFIAMD64BootMethod`."""
 
+    def test_match_path_none(self):
+        method = UEFIAMD64BootMethod()
+        backend = random.choice(["http", "tftp"])
+        self.assertIsNone(
+            method.match_path(backend, factory.make_string().encode())
+        )
+
+    def test_match_path_mac_colon(self):
+        method = UEFIAMD64BootMethod()
+        backend = random.choice(["http", "tftp"])
+        mac = factory.make_mac_address()
+        self.assertEqual(
+            {"mac": mac.replace(":", "-")},
+            method.match_path(backend, f"/grub/grub.cfg-{mac}".encode()),
+        )
+
+    def test_match_path_mac_dash(self):
+        method = UEFIAMD64BootMethod()
+        backend = random.choice(["http", "tftp"])
+        mac = factory.make_mac_address().replace(":", "-")
+        self.assertEqual(
+            {"mac": mac},
+            method.match_path(backend, f"/grub/grub.cfg-{mac}".encode()),
+        )
+
+    def test_match_path_arch(self):
+        method = UEFIAMD64BootMethod()
+        backend = random.choice(["http", "tftp"])
+        arch = factory.make_string()
+        self.assertEqual(
+            {"arch": arch},
+            method.match_path(
+                backend, f"/grub/grub.cfg-default-{arch}".encode()
+            ),
+        )
+
+    def test_match_path_arch_x86_64(self):
+        method = UEFIAMD64BootMethod()
+        backend = random.choice(["http", "tftp"])
+        self.assertEqual(
+            {"arch": "amd64"},
+            method.match_path(backend, b"/grub/grub.cfg-default-x86_64"),
+        )
+
+    def test_match_path_arch_powerpc(self):
+        method = UEFIAMD64BootMethod()
+        backend = random.choice(["http", "tftp"])
+        self.assertEqual(
+            {"arch": "ppc64el"},
+            method.match_path(backend, b"/grub/grub.cfg-default-powerpc"),
+        )
+
+    def test_match_path_arch_ppc64(self):
+        method = UEFIAMD64BootMethod()
+        backend = random.choice(["http", "tftp"])
+        self.assertEqual(
+            {"arch": "ppc64el"},
+            method.match_path(backend, b"/grub/grub.cfg-default-ppc64"),
+        )
+
+    def test_match_path_arch_ppc64le(self):
+        method = UEFIAMD64BootMethod()
+        backend = random.choice(["http", "tftp"])
+        self.assertEqual(
+            {"arch": "ppc64el"},
+            method.match_path(backend, b"/grub/grub.cfg-default-ppc64le"),
+        )
+
+    def test_match_path_arch_subarch(self):
+        method = UEFIAMD64BootMethod()
+        backend = random.choice(["http", "tftp"])
+        arch = factory.make_string()
+        subarch = factory.make_string()
+        self.assertEqual(
+            {"arch": arch, "subarch": subarch},
+            method.match_path(
+                backend, f"/grub/grub.cfg-default-{arch}-{subarch}".encode()
+            ),
+        )
+
     def test_link_bootloader_creates_grub_cfg(self):
         method = UEFIAMD64BootMethod()
         with tempdir() as tmp:
diff --git a/src/provisioningserver/boot/uefi_amd64.py b/src/provisioningserver/boot/uefi_amd64.py
index 4e42c78..1399fa0 100644
--- a/src/provisioningserver/boot/uefi_amd64.py
+++ b/src/provisioningserver/boot/uefi_amd64.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """UEFI AMD64 Boot Method"""
@@ -24,11 +24,11 @@ CONFIG_FILE = dedent(
     # MAAS GRUB2 pre-loader configuration file
 
     # Load based on MAC address first.
-    configfile (pxe)/grub/grub.cfg-${net_default_mac}
+    configfile /grub/grub.cfg-${net_default_mac}
 
-    # Failed to load based on MAC address.
-    # Load amd64 by default, UEFI only supported by 64-bit
-    configfile (pxe)/grub/grub.cfg-default-amd64
+    # Failed to load based on MAC address. Load based on the CPU
+    # architecture.
+    configfile /grub/grub.cfg-default-${grub_cpu}
     """
 )
 
@@ -36,7 +36,7 @@ CONFIG_FILE = dedent(
 # format. Required for UEFI as GRUB2 only presents the MAC address
 # in colon-seperated format.
 re_mac_address_octet = r"[0-9a-f]{2}"
-re_mac_address = re.compile(":".join(repeat(re_mac_address_octet, 6)))
+re_mac_address = re.compile("[:-]".join(repeat(re_mac_address_octet, 6)))
 
 # Match the grub/grub.cfg-* request for UEFI (aka. GRUB2)
 re_config_file = r"""
@@ -48,10 +48,10 @@ re_config_file = r"""
         (?P<mac>{re_mac_address.pattern}) # Capture UEFI MAC.
     | # or "default"
         default
-          (?: # perhaps with specified arch, with a separator of '-'
+            (?: # perhaps with specified arch, with a separator of '-'
             [-](?P<arch>\w+) # arch
             (?:-(?P<subarch>\w+))? # optional subarch
-          )?
+            )?
     )
     $
 """
@@ -90,6 +90,14 @@ class UEFIAMD64BootMethod(BootMethod):
         if mac is not None:
             params["mac"] = mac.replace(":", "-")
 
+        # MAAS uses Debian architectures while GRUB uses standard Linux
+        # architectures.
+        arch = params.get("arch")
+        if arch == "x86_64":
+            params["arch"] = "amd64"
+        elif arch in {"powerpc", "ppc64", "ppc64le"}:
+            params["arch"] = "ppc64el"
+
         return params
 
     def get_reader(self, backend, kernel_params, **extra):
@@ -124,7 +132,9 @@ class UEFIAMD64BootMethod(BootMethod):
         # UEFI.  And so we fix it here, instead of in the common code.  See
         # also src/provisioningserver/kernel_opts.py.
         namespace["kernel_command"] = kernel_command
-        return BytesReader(template.substitute(namespace).encode("utf-8"))
+        return BytesReader(
+            template.substitute(namespace).strip().encode("utf-8")
+        )
 
     def _find_and_copy_bootloaders(self, destination, log_missing=True):
         if not super()._find_and_copy_bootloaders(destination, False):
diff --git a/src/provisioningserver/config.py b/src/provisioningserver/config.py
index 5177450..49f4da2 100644
--- a/src/provisioningserver/config.py
+++ b/src/provisioningserver/config.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Configuration for the MAAS cluster.
@@ -104,6 +104,7 @@ It can be used like so::
 
 from contextlib import closing, contextmanager
 from copy import deepcopy
+from functools import lru_cache
 from itertools import islice
 import json
 import logging
@@ -812,3 +813,10 @@ def is_dev_environment():
         return False
     else:
         return True
+
+
+@lru_cache(1)
+def debug_enabled():
+    """Return and cache whether debug has been enabled."""
+    with ClusterConfiguration.open() as config:
+        return config.debug
diff --git a/src/provisioningserver/templates/uefi/config.commissioning.amd64.template b/src/provisioningserver/templates/uefi/config.commissioning.amd64.template
deleted file mode 100644
index 47dbec9..0000000
--- a/src/provisioningserver/templates/uefi/config.commissioning.amd64.template
+++ /dev/null
@@ -1,8 +0,0 @@
-set default="0"
-set timeout=0
-
-menuentry 'Commission' {
-    echo      'Booting under MAAS direction...'
-    linuxefi  {{kernel_params | fs_efihost}}{{kernel_params | kernel_path }} {{kernel_params | kernel_command}} BOOTIF=01-${net_default_mac}
-    initrdefi {{kernel_params | fs_efihost}}{{kernel_params | initrd_path }}
-}
diff --git a/src/provisioningserver/templates/uefi/config.commissioning.template b/src/provisioningserver/templates/uefi/config.commissioning.template
index c860a79..cc3f2fc 100644
--- a/src/provisioningserver/templates/uefi/config.commissioning.template
+++ b/src/provisioningserver/templates/uefi/config.commissioning.template
@@ -1,7 +1,8 @@
+{{if debug}}set debug="all"{{endif}}
 set default="0"
 set timeout=0
 
-menuentry 'Commission' {
+menuentry 'Ephemeral' {
     echo   'Booting under MAAS direction...'
     linux  {{kernel_params | fs_efihost}}{{kernel_params | kernel_path }} {{kernel_params | kernel_command}} BOOTIF=01-${net_default_mac}
     initrd {{kernel_params | fs_efihost}}{{kernel_params | initrd_path }}
diff --git a/src/provisioningserver/templates/uefi/config.enlist.amd64.template b/src/provisioningserver/templates/uefi/config.enlist.amd64.template
deleted file mode 100644
index edf800e..0000000
--- a/src/provisioningserver/templates/uefi/config.enlist.amd64.template
+++ /dev/null
@@ -1,8 +0,0 @@
-set default="0"
-set timeout=0
-
-menuentry 'Enlist' {
-    echo      'Booting under MAAS direction...'
-    linuxefi  {{kernel_params | fs_efihost}}{{kernel_params | kernel_path }} {{kernel_params | kernel_command}} BOOTIF=01-${net_default_mac}
-    initrdefi {{kernel_params | fs_efihost}}{{kernel_params | initrd_path }}
-}
diff --git a/src/provisioningserver/templates/uefi/config.enlist.template b/src/provisioningserver/templates/uefi/config.enlist.template
deleted file mode 100644
index 3546960..0000000
--- a/src/provisioningserver/templates/uefi/config.enlist.template
+++ /dev/null
@@ -1,8 +0,0 @@
-set default="0"
-set timeout=0
-
-menuentry 'Enlist' {
-    echo   'Booting under MAAS direction...'
-    linux  {{kernel_params | fs_efihost}}{{kernel_params | kernel_path }} {{kernel_params | kernel_command}} BOOTIF=01-${net_default_mac}
-    initrd {{kernel_params | fs_efihost}}{{kernel_params | initrd_path }}
-}
diff --git a/src/provisioningserver/templates/uefi/config.enlist.template b/src/provisioningserver/templates/uefi/config.enlist.template
new file mode 120000
index 0000000..f0f1b87
--- /dev/null
+++ b/src/provisioningserver/templates/uefi/config.enlist.template
@@ -0,0 +1 @@
+config.commissioning.template
\ No newline at end of file
diff --git a/src/provisioningserver/templates/uefi/config.install.amd64.template b/src/provisioningserver/templates/uefi/config.install.amd64.template
deleted file mode 100644
index eea84e0..0000000
--- a/src/provisioningserver/templates/uefi/config.install.amd64.template
+++ /dev/null
@@ -1,8 +0,0 @@
-set default="0"
-set timeout=0
-
-menuentry 'Install' {
-    echo      'Booting under MAAS direction...'
-    linuxefi  {{kernel_params | fs_efihost}}{{kernel_params | kernel_path }} {{kernel_params | kernel_command}} BOOTIF=01-${net_default_mac}
-    initrdefi {{kernel_params | fs_efihost}}{{kernel_params | initrd_path }}
-}
diff --git a/src/provisioningserver/templates/uefi/config.install.template b/src/provisioningserver/templates/uefi/config.install.template
deleted file mode 100644
index 7bd9538..0000000
--- a/src/provisioningserver/templates/uefi/config.install.template
+++ /dev/null
@@ -1,8 +0,0 @@
-set default="0"
-set timeout=0
-
-menuentry 'Install' {
-    echo   'Booting under MAAS direction...'
-    linux  {{kernel_params | fs_efihost}}{{kernel_params | kernel_path }} {{kernel_params | kernel_command}} BOOTIF=01-${net_default_mac}
-    initrd {{kernel_params | fs_efihost}}{{kernel_params | initrd_path }}
-}
diff --git a/src/provisioningserver/templates/uefi/config.local.amd64.template b/src/provisioningserver/templates/uefi/config.local.amd64.template
index c7d3d4c..7cfc382 100644
--- a/src/provisioningserver/templates/uefi/config.local.amd64.template
+++ b/src/provisioningserver/templates/uefi/config.local.amd64.template
@@ -1,3 +1,4 @@
+{{if debug}}set debug="all"{{endif}}
 set default="0"
 set timeout=0
 
diff --git a/src/provisioningserver/templates/uefi/config.local.arm64.template b/src/provisioningserver/templates/uefi/config.local.arm64.template
index cb34b1b..ab10c41 100644
--- a/src/provisioningserver/templates/uefi/config.local.arm64.template
+++ b/src/provisioningserver/templates/uefi/config.local.arm64.template
@@ -1,3 +1,4 @@
+{{if debug}}set debug="all"{{endif}}
 set default="0"
 set timeout=0
 
diff --git a/src/provisioningserver/templates/uefi/config.local.ppc64el.template b/src/provisioningserver/templates/uefi/config.local.ppc64el.template
index b592f26..406451b 100644
--- a/src/provisioningserver/templates/uefi/config.local.ppc64el.template
+++ b/src/provisioningserver/templates/uefi/config.local.ppc64el.template
@@ -1,3 +1,4 @@
+{{if debug}}set debug="all"{{endif}}
 set default="0"
 set timeout=0
 
diff --git a/src/provisioningserver/templates/uefi/config.poweroff.template b/src/provisioningserver/templates/uefi/config.poweroff.template
index 451be03..95016c7 100644
--- a/src/provisioningserver/templates/uefi/config.poweroff.template
+++ b/src/provisioningserver/templates/uefi/config.poweroff.template
@@ -1,3 +1,4 @@
+{{if debug}}set debug="all"{{endif}}
 set default="0"
 set timeout=0
 
diff --git a/src/provisioningserver/templates/uefi/config.xinstall.amd64.template b/src/provisioningserver/templates/uefi/config.xinstall.amd64.template
deleted file mode 120000
index d321baa..0000000
--- a/src/provisioningserver/templates/uefi/config.xinstall.amd64.template
+++ /dev/null
@@ -1 +0,0 @@
-config.install.amd64.template
\ No newline at end of file
diff --git a/src/provisioningserver/templates/uefi/config.xinstall.template b/src/provisioningserver/templates/uefi/config.xinstall.template
index 44389e4..f0f1b87 120000
--- a/src/provisioningserver/templates/uefi/config.xinstall.template
+++ b/src/provisioningserver/templates/uefi/config.xinstall.template
@@ -1 +1 @@
-config.install.template
\ No newline at end of file
+config.commissioning.template
\ No newline at end of file
diff --git a/src/provisioningserver/tests/test_config.py b/src/provisioningserver/tests/test_config.py
index 1488283..90c4841 100644
--- a/src/provisioningserver/tests/test_config.py
+++ b/src/provisioningserver/tests/test_config.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for provisioning configuration."""
@@ -29,6 +29,7 @@ from maastesting.factory import factory
 from maastesting.fixtures import ImportErrorFixture
 from maastesting.matchers import MockCalledOnceWith, MockNotCalled
 from maastesting.testcase import MAASTestCase
+from provisioningserver import config as config_module
 from provisioningserver.config import (
     ClusterConfiguration,
     Configuration,
@@ -37,6 +38,7 @@ from provisioningserver.config import (
     ConfigurationImmutable,
     ConfigurationMeta,
     ConfigurationOption,
+    debug_enabled,
     is_dev_environment,
 )
 from provisioningserver.path import get_data_path
@@ -724,3 +726,30 @@ class TestConfig(MAASTestCase):
 
     def test_is_dev_environment_returns_true(self):
         self.assertTrue(is_dev_environment())
+
+
+class TestDebugEnabled(MAASTestCase):
+    """Tests for `debug_enabled`."""
+
+    def setUp(self):
+        super().setUp()
+        # Make sure things aren't pulled from cache
+        debug_enabled.cache_clear()
+
+    def test_debug_enabled_false(self):
+        # Verifies that the default state of debug is false.
+        self.assertFalse(debug_enabled())
+
+    def test_debug_enabled(self):
+        debug = factory.pick_bool()
+        self.useFixture(ClusterConfigurationFixture(debug=debug))
+        self.assertEqual(debug, debug_enabled())
+
+    def test_debug_enabled_cached(self):
+        debug = factory.pick_bool()
+        self.useFixture(ClusterConfigurationFixture(debug=debug))
+        # Prime cache
+        debug_enabled()
+        mock_open = self.patch(config_module.ClusterConfiguration, "open")
+        self.assertEqual(debug, debug_enabled())
+        mock_open.assert_not_called()