Merge ~mpontillo/maas:add-deploy-kvm-ui--bug-1795013 into maas:master

[Mike Pontillo]

LP: #1795013 - Add KVM deployment option to the UI

I'm not sure if the tickbox text (or the fact that there should be a tickbox at all) are finalized, but this is a first pass at KVM pod deployment.

I noticed an alignment issue with the tickboxes; it can be seen by comparing the "Allow SSH..." tick with the green tick in the node listing in the following screenshot (it seems to be a pre-existing issue):

https://usercontent.irccloud-cdn.com/file/atu4Zcy1/tickbox-alignment.png

With that in mind, here are a couple of screenshots of this change, from the machine listing and machine details pages, respectively:

https://usercontent.irccloud-cdn.com/file/VOM7JyXn/install-kvm-checkbox.png
https://usercontent.irccloud-cdn.com/file/qrKlNUgB/checkbox-install-kvm-from-details.png

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add-deploy-kvm-ui--bug-1795013 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4118/console
COMMIT: a44f2c82b8f6df3d445e97099eccc7bb508f70c4

review: Needs Fixing

[Kit Randel (blr)]

code lgtm, just a few comments inline.

review: Approve

[Andres Rodriguez (andreserl)]

We should send this over to UX team for a quick view.

On Tue, Oct 9, 2018 at 9:37 PM Kit Randel <email address hidden> wrote:

> Review: Approve
>
> code lgtm, just a few comments inline.
>
> Diff comments:
>
> > diff --git
> a/src/maasserver/static/js/angular/controllers/node_details.js
> b/src/maasserver/static/js/angular/controllers/node_details.js
> > index 55d1c16..f4083b5 100644
> > --- a/src/maasserver/static/js/angular/controllers/node_details.js
> > +++ b/src/maasserver/static/js/angular/controllers/node_details.js
> > @@ -139,9 +142,9 @@
> angular.module('MAAS').controller('NodeDetailsController', [
> > // id matching the node id. Otherwise we end up setting our
> > // selected field to an option not from DomainsManager which
> > // doesn't work.
> > - var i;
> > + let i;
> > for(i=0;i<$scope.header.domain.options.length;i++) {
>
> Can `i` be initialised inside the `for` like the other cases?
>
> > - var option = $scope.header.domain.options[i];
> > + let option = $scope.header.domain.options[i];
> > if(option.id === $scope.node.domain.id) {
> > $scope.header.domain.selected = option;
> > break;
> > @@ -592,13 +592,14 @@
> angular.module('MAAS').controller('NodeDetailsController', [
> > $scope.osSelection.hwe_kernel.indexOf('ga-') >= 0))
> {
> > extra.hwe_kernel = $scope.osSelection.hwe_kernel;
> > }
> > + extra.install_kvm = $scope.deployOptions.installKVM;
> > } else if($scope.action.option.name === "commission") {
> > extra.enable_ssh = $scope.commissionOptions.enableSSH;
> > extra.skip_networking = (
> > $scope.commissionOptions.skipNetworking);
> > extra.skip_storage =
> $scope.commissionOptions.skipStorage;
> > extra.commissioning_scripts = [];
> > - for(i=0;i<$scope.commissioningSelection.length;i++) {
> > + for(let i=0;i<$scope.commissioningSelection.length;i++)
> {
>
> A minor point, but this is a bit more readable with spaces around the
> operators and after the semi-colons (like l93).
>
> > extra.commissioning_scripts.push(
> > $scope.commissioningSelection[i].id);
> > }
>
>
> --
> https://code.launchpad.net/~mpontillo/maas/+git/maas/+merge/356376
> You are reviewing the proposed merge of
> ~mpontillo/maas:add-deploy-kvm-ui--bug-1795013 into maas:master.
>
--
Andres Rodriguez
Engineering Manager, MAAS
Canonical USA, Inc.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add-deploy-kvm-ui--bug-1795013 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4119/console
COMMIT: 00f7b9d9a648d91a5c6e46da92c1dae369dea4f6

review: Needs Fixing

[Lilyana Videnova (lilyanavidenova)]

We suggest adding a label (Additional installs) as well as an information icon + a link to the appropriate docs (https://docs.maas.io/2.5/en/nodes-comp-hw). The text of the checkbox then loses the word "install".

A rough wireframe: https://usercontent.irccloud-cdn.com/file/goCKhGSm/deploy%20KVM%20ui.png

[Anthony Dillon (ya-bo-ng)]

Looks good +1. I am having a little trouble reproducing the wireframe for it to be a quick patch for this branch. This should land as is and I'll fix up the UI and alignment of checkboxes in a follow up branch.

review: Approve

[Mike Pontillo (mpontillo)]

Thanks for taking a look, all.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add-deploy-kvm-ui--bug-1795013 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4132/console
COMMIT: 36867d99144ed602d0dd5c27d4c8e09178769e97

review: Needs Fixing

[Andres Rodriguez (andreserl)]

couple comments inline and a question here.

Does this option only show when you select Ubuntu as the default OS?

review: Needs Information

[Mike Pontillo (mpontillo)]

Andres, your review brings up some good points, many of which are still undecided, I think.

== Interactions Between KVM Pod Installation and OS Selection ==

I didn't implement any special functionality in the UI for causing the "Install KVM" option to modify the OS selection. I think it should probably gray out the OS selection (and possibly select Bionic automatically) to make it clear that the user doesn't get a choice.

Instead, what happens in this branch is, if you select "Install KVM", on the back-end it forces the OS selection to become "ubuntu/bionic".

This needs to be revisited in a future branch to provide a complete solution, because when you specify install_kvm from the API, no such forced-OS-selection occurs. For supportability purposes, we should always deploy KVM with the latest LTS we've tested it on (in this case, bionic).

In summary, this branch is more of an initial cut than a polished version of this UI action. It just gets the basics done.

== KVM Pod Labels and Terminology ==

I kind of disagree with putting (pod) in parentheses. It's not a (pod), it's a Pod, according to our current UI. I proposed this branch without mentioning "pod" in anticipation of the idea that the "Pod" terminology might be going away in the near future. I feel that if it's not going away, we might as well say "KVM Pod".

The API/model terminology of "install_kvm" is similarly vague. To many people, including data center engineers, KVM might mean "Keyboard/Video/Mouse".

More generally, this needs to be more consistent in other places in the UI. In other branches I've seen proposed (and in the actual UI itself), we often say "Virsh pod", which is also weird. (Likely because the power type for a KVM pod is literally "virsh", but we can correct that in the UI, to some degree).

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add-deploy-kvm-ui--bug-1795013 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 4561bbf26c02cc5bee9a04664e2fe5eeb0cdeab5

review: Approve

[Lee Trager (ltrager)]

Thanks for adding the admin check :)

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add-deploy-kvm-ui--bug-1795013 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 4febb6fcb1182672ef45e64444d621a4f8a635fc

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add-deploy-kvm-ui--bug-1795013 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4139/console
COMMIT: cfcee8dbd98ebe17142790cac8e57bcf3152a5ee

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add-deploy-kvm-ui--bug-1795013 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4141/console
COMMIT: 83f6c086d1f38484043f5fcbc4a4c06158297f2c

review: Needs Fixing

[Martin Storey (cassiocassio)]

Revised proposal from UX:

1. OS selection updates automagically when checking "install KVM"

Menus that jump around automatically when you check checkboxes don't help the user understand the OS requirement - they have to notice that it changed, and they have to intuit why.

If we do this, we should
  - put an "[i] 18.04 Bionic required for a KVM host" under the OS selector.
  - disable the pulldown so they have to uncheck KVM to pick a different OS.

that said, Bionic is the default, and a user will have to switch away from the default to encounter this.

so,

2. selecting away from Bionic should disable the KVM checkbox and text, so you can't click it.
  - put an "[i] KVM requires 18.04 Bionic" under the KVM checkbox.

if it was already checked, bionic will already be selected.

NB

- in the future we'll need to cope with 19.04, 20.04 etc which will be viable options for KVM.

[Andres Rodriguez (andreserl)]

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add-deploy-kvm-ui--bug-1795013 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 68a594c06452790907ab78428e80502b82c3369b

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add-deploy-kvm-ui--bug-1795013 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4159/console
COMMIT: ebb00aeec73c3b05556e344c25bbc6b22b92ff93

review: Needs Fixing

[Andres Rodriguez (andreserl)]

review: Needs Information

[MAAS Lander (maas-lander)]

UNIT TESTS
-b add-deploy-kvm-ui--bug-1795013 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: e1f1fdc1cba18a0905bc13b71e018e26aeb56b69

review: Approve

[Andres Rodriguez (andreserl)]

I've chatted with Mike about this and I agree with him that it would be good to land this, so that it unblocks further development on this.

We will target the UX improvements of this for next week.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b add-deploy-kvm-ui--bug-1795013 lp:~mpontillo/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED MERGE
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-lander/302381/console

[Martin Storey (cassiocassio)]

this is merged, but for completeness: the proposed UX improvements to this feature are here:

https://zpl.io/boZoEgE

[Martin Storey (cassiocassio)]

review: Approve

diff --git a/src/maasserver/node_action.py b/src/maasserver/node_action.py
index e30ab66..f299700 100644
--- a/src/maasserver/node_action.py
+++ b/src/maasserver/node_action.py
@@ -456,23 +456,43 @@ class Deploy(NodeAction):
         """Retrieve the node action audit description."""
         return self.audit_description % action.node.hostname
 
-    def _execute(self, osystem=None, distro_series=None, hwe_kernel=None):
+    def _execute(
+            self, osystem=None, distro_series=None, hwe_kernel=None,
+            install_kvm=False):
         """See `NodeAction.execute`."""
+        if install_kvm:
+            if not self.user.is_superuser:
+                raise NodeActionError(
+                    "You must be a MAAS administrator to deploy a machine "
+                    "as a MAAS-managed KVM Pod.")
         if self.node.owner is None:
             with locks.node_acquire:
                 try:
                     self.node.acquire(self.user, token=None)
                 except ValidationError as e:
                     raise NodeActionError(e)
-
-        if osystem and distro_series:
+        if install_kvm:
+            try:
+                # KVM Pod installation should default to ubuntu/bionic, since
+                # that was the release it was tested on.
+                if osystem is None:
+                    osystem = 'ubuntu'
+                if distro_series is None:
+                    distro_series = 'bionic'
+                self.node.osystem, self.node.distro_series = (
+                    validate_osystem_and_distro_series(osystem, distro_series)
+                )
+                self.node.install_kvm = True
+                self.node.save()
+            except ValidationError as e:
+                raise NodeActionError(e)
+        elif osystem and distro_series:
             try:
                 self.node.osystem, self.node.distro_series = (
                     validate_osystem_and_distro_series(osystem, distro_series))
                 self.node.save()
             except ValidationError as e:
                 raise NodeActionError(e)
-
         try:
             self.node.hwe_kernel = validate_hwe_kernel(
                 hwe_kernel, self.node.min_hwe_kernel,
diff --git a/src/maasserver/static/js/angular/controllers/node_details.js b/src/maasserver/static/js/angular/controllers/node_details.js
index ce6f2f9..7924054 100644
--- a/src/maasserver/static/js/angular/controllers/node_details.js
+++ b/src/maasserver/static/js/angular/controllers/node_details.js
@@ -56,6 +56,9 @@ angular.module('MAAS').controller('NodeDetailsController', [
             updateFirmware: false,
             configureHBA: false
         };
+        $scope.deployOptions = {
+            installKVM: false,
+        };
         $scope.commissioningSelection = [];
         $scope.testSelection = [];
         $scope.releaseOptions = {};
@@ -140,9 +143,8 @@ angular.module('MAAS').controller('NodeDetailsController', [
             // id matching the node id. Otherwise we end up setting our
             // selected field to an option not from DomainsManager which
             // doesn't work.
-            var i;
-            for(i=0;i<$scope.header.domain.options.length;i++) {
-                var option = $scope.header.domain.options[i];
+            for(let i = 0 ; i < $scope.header.domain.options.length ; i++) {
+                let option = $scope.header.domain.options[i];
                 if(option.id === $scope.node.domain.id) {
                     $scope.header.domain.selected = option;
                     break;
@@ -155,7 +157,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
             if(!angular.isObject($scope.node)) {
                 return;
             }
-            var actionTypeForNodeType = {
+            const actionTypeForNodeType = {
                 0: "machine_actions",
                 1: "device_actions",
                 2: "rack_controller_actions",
@@ -183,7 +185,6 @@ angular.module('MAAS').controller('NodeDetailsController', [
                 // isn't called until after load as its triggered on the loaded
                 // node's actions. If the node's action list isn't loaded load
                 // it then update the available options.
-                var self = updateAvailableActionOptions;
                 GeneralManager.loadItems(
                     [actionTypeForNodeType[$scope.node.node_type]]).then(
                     updateAvailableActionOptions);
@@ -198,9 +199,8 @@ angular.module('MAAS').controller('NodeDetailsController', [
                 return;
             }
 
-            var i;
             $scope.power.type = null;
-            for(i = 0; i < $scope.power_types.length; i++) {
+            for(let i = 0; i < $scope.power_types.length; i++) {
                 if($scope.node.power_type === $scope.power_types[i].name) {
                     $scope.power.type = $scope.power_types[i];
                     break;
@@ -572,8 +572,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
 
         // Perform the action.
         $scope.actionGo = function() {
-            var extra = {};
-            var i;
+            let extra = {};
             // Set deploy parameters if a deploy.
             if($scope.action.option.name === "deploy" &&
                 angular.isString($scope.osSelection.osystem) &&
@@ -593,6 +592,13 @@ angular.module('MAAS').controller('NodeDetailsController', [
                     $scope.osSelection.hwe_kernel.indexOf('ga-') >= 0)) {
                     extra.hwe_kernel = $scope.osSelection.hwe_kernel;
                 }
+                let installKVM = $scope.deployOptions.installKVM;
+                // KVM pod deployment required bionic.
+                if(installKVM) {
+                    extra.osystem = "ubuntu";
+                    extra.distro_series = "bionic";
+                }
+                extra.install_kvm = installKVM;
             } else if($scope.action.option.name === "commission") {
                 extra.enable_ssh = $scope.commissionOptions.enableSSH;
                 extra.skip_bmc_config = $scope.commissionOptions.skipBMCConfig;
@@ -600,7 +606,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
                     $scope.commissionOptions.skipNetworking);
                 extra.skip_storage = $scope.commissionOptions.skipStorage;
                 extra.commissioning_scripts = [];
-                for(i=0;i<$scope.commissioningSelection.length;i++) {
+                for(let i = 0 ; i < $scope.commissioningSelection.length ; i++){
                     extra.commissioning_scripts.push(
                         $scope.commissioningSelection[i].id);
                 }
@@ -616,7 +622,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
                     extra.commissioning_scripts.push('none');
                 }
                 extra.testing_scripts = [];
-                for(i=0;i<$scope.testSelection.length;i++) {
+                for(let i=0 ; i < $scope.testSelection.length ; i++) {
                     extra.testing_scripts.push($scope.testSelection[i].id);
                 }
                 if(extra.testing_scripts.length === 0) {
@@ -632,7 +638,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
                 // Set the test options.
                 extra.enable_ssh = $scope.commissionOptions.enableSSH;
                 extra.testing_scripts = [];
-                for(i=0;i<$scope.testSelection.length;i++) {
+                for(let i = 0 ; i < $scope.testSelection.length ; i++) {
                     extra.testing_scripts.push($scope.testSelection[i].id);
                 }
                 if(extra.testing_scripts.length === 0) {
@@ -1097,7 +1103,7 @@ angular.module('MAAS').controller('NodeDetailsController', [
             } else {
                 return label + " @ " + ($scope.node.cpu_speed / 1000) + " Ghz";
             }
-        }
+        };
 
         // Reload osinfo when the page reloads
         $scope.$on("$routeUpdate", function () {
diff --git a/src/maasserver/static/js/angular/controllers/nodes_list.js b/src/maasserver/static/js/angular/controllers/nodes_list.js
index 8a71a0a..dea2857 100644
--- a/src/maasserver/static/js/angular/controllers/nodes_list.js
+++ b/src/maasserver/static/js/angular/controllers/nodes_list.js
@@ -93,6 +93,9 @@ angular.module('MAAS').controller('NodesListController', [
             updateFirmware: false,
             configureHBA: false
         };
+        $scope.tabs.machines.deployOptions = {
+            installKVM: false
+        };
         $scope.tabs.machines.releaseOptions = {};
         $scope.tabs.machines.commissioningSelection = [];
         $scope.tabs.machines.testSelection = [];
@@ -153,7 +156,7 @@ angular.module('MAAS').controller('NodesListController', [
             $scope.toggleTab('machines');
             // update the location URL otherwise to match the tab
             $location.path('/machines');
-        }
+        };
         $scope.tabs.pools.isDefaultPool = function(pool) {
             return pool.id === 0;
         };
@@ -266,6 +269,9 @@ angular.module('MAAS').controller('NodesListController', [
             updateFirmware: false,
             configureHBA: false
         };
+        $scope.tabs.switches.deployOptions = {
+            installKVM: false
+        };
         $scope.tabs.switches.releaseOptions = {};
 
 
@@ -359,6 +365,7 @@ angular.module('MAAS').controller('NodesListController', [
                 $scope.tabs[tab].commissionOptions.skipStorage = false;
                 $scope.tabs[tab].commissionOptions.updateFirmware = false;
                 $scope.tabs[tab].commissionOptions.configureHBA = false;
+                $scope.tabs[tab].deployOptions.installKVM = false;
             }
             $scope.tabs[tab].commissioningSelection = [];
             $scope.tabs[tab].testSelection = [];
@@ -721,6 +728,13 @@ angular.module('MAAS').controller('NodesListController', [
                     tab.osSelection.hwe_kernel.indexOf('ga-') >= 0)) {
                     extra.hwe_kernel = tab.osSelection.hwe_kernel;
                 }
+                let installKVM = tab.deployOptions.installKVM;
+                // KVM pod deployment requires bionic.
+                if(installKVM) {
+                    extra.osystem = "ubuntu";
+                    extra.distro_series = "bionic";
+                }
+                extra.install_kvm = installKVM;
             } else if(tab.actionOption.name === "set-zone" &&
                 angular.isNumber(tab.zoneSelection.id)) {
                 // Set the zone parameter.
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_node_details.js b/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
index 135045a..5757c4c 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_node_details.js
@@ -1057,7 +1057,29 @@ describe("NodeDetailsController", function() {
             expect(MachinesManager.performAction).toHaveBeenCalledWith(
                 node, "deploy", {
                     osystem: "ubuntu",
-                    distro_series: "trusty"
+                    distro_series: "trusty",
+                    install_kvm: false
+                });
+        });
+
+        it("calls performAction with install_kvm", function() {
+            var controller = makeController();
+            spyOn(MachinesManager, "performAction").and.returnValue(
+                $q.defer().promise);
+            $scope.node = node;
+            $scope.action.option = {
+                name: "deploy"
+            };
+            $scope.osSelection.osystem = "debian";
+            $scope.osSelection.release = "etch";
+            $scope.deployOptions.installKVM = true;
+            $scope.actionGo();
+            // When deploying KVM, coerce the distro to ubuntu/bionic.
+            expect(MachinesManager.performAction).toHaveBeenCalledWith(
+                node, "deploy", {
+                    osystem: "ubuntu",
+                    distro_series: "bionic",
+                    install_kvm: true
                 });
         });
 
@@ -1077,7 +1099,8 @@ describe("NodeDetailsController", function() {
                 node, "deploy", {
                     osystem: "ubuntu",
                     distro_series: "xenial",
-                    hwe_kernel: "hwe-16.04-edge"
+                    hwe_kernel: "hwe-16.04-edge",
+                    install_kvm: false
                 });
         });
 
@@ -1097,7 +1120,8 @@ describe("NodeDetailsController", function() {
                 node, "deploy", {
                     osystem: "ubuntu",
                     distro_series: "xenial",
-                    hwe_kernel: "ga-16.04"
+                    hwe_kernel: "ga-16.04",
+                    install_kvm: false
                 });
         });
 
diff --git a/src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js b/src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js
index df95ba7..92e467b 100644
--- a/src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js
+++ b/src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js
@@ -1576,7 +1576,32 @@ describe("NodesListController", function() {
                     expect(spy).toHaveBeenCalledWith(
                         object, "deploy", {
                             osystem: "ubuntu",
-                            distro_series: "trusty"
+                            distro_series: "trusty",
+                            install_kvm: false
+                        });
+            });
+
+            it("calls performAction with install_kvm",
+                function() {
+                    var controller = makeController();
+                    var object = makeObject("machines");
+                    var spy = spyOn(
+                        $scope.tabs.machines.manager,
+                        "performAction").and.returnValue(
+                        $q.defer().promise);
+                    $scope.tabs.machines.actionOption = {name: "deploy"};
+                    $scope.tabs.machines.selectedItems = [object];
+                    $scope.tabs.machines.osSelection.osystem = "debian";
+                    $scope.tabs.machines.osSelection.release = "etch";
+                    $scope.tabs.machines.deployOptions.installKVM = true;
+                    $scope.actionGo("machines");
+                    $scope.$digest();
+                    // When deploying KVM, coerce the distro to ubuntu/bionic.
+                    expect(spy).toHaveBeenCalledWith(
+                        object, "deploy", {
+                            osystem: "ubuntu",
+                            distro_series: "bionic",
+                            install_kvm: true
                         });
             });
 
diff --git a/src/maasserver/static/partials/node-details.html b/src/maasserver/static/partials/node-details.html
index b74ab09..00c81b4 100755
--- a/src/maasserver/static/partials/node-details.html
+++ b/src/maasserver/static/partials/node-details.html
@@ -104,6 +104,14 @@
                             <div class="col-12 u-no-margin--left" data-ng-show="action.option.name === 'deploy' || action.option.name === 'release'">
                                 <div class="ng-hide" data-ng-show="action.option.name === 'deploy'">
                                     <div data-maas-os-select="osinfo" data-ng-model="osSelection"></div>
+                                    <div class="row" data-ng-if="isSuperUser()">
+                                        <ul class="p-inline-list--settings u-no-margin--left u-no-padding--left">
+                                            <li class="p-inline-list__item">
+                                                <input id="installKVM" type="checkbox" data-ng-model="deployOptions.installKVM"></input>
+                                                <label for="installKVM">Install MAAS-managed KVM Pod</label>
+                                            </li>
+                                        </ul>
+                                    </div>
                                 </div>
                                 <div data-ng-if="action.option.name === 'release'" class="u-no-margin--top">
                                     <div data-maas-release-options="releaseOptions"></div>
diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
index 4364061..db4abeb 100644
--- a/src/maasserver/static/partials/nodes-list.html
+++ b/src/maasserver/static/partials/nodes-list.html
@@ -209,6 +209,14 @@
                             <div class="p-form__group ng-hide" data-ng-show="tabs[tab].actionOption.name === 'deploy'">
                                 <div class="p-form__control u-clearfix">
                                     <div data-maas-os-select="osinfo" data-ng-model="tabs[tab].osSelection"></div>
+                                    <div class="row" data-ng-if="isSuperUser()">
+                                    <ul class="p-inline-list--settings u-no-margin--left u-no-padding--left">
+                                        <li class="p-inline-list__item">
+                                            <input id="{$ tab $}-installKVM" type="checkbox" data-ng-model="tabs[tab].deployOptions.installKVM"></input>
+                                            <label for="{$ tab $}-installKVM">Install MAAS-managed KVM Pod</label>
+                                        </li>
+                                    </ul>
+                                    </div>
                                 </div>
                                 <div data-ng-if="tabs[tab].actionOption.name === 'release'">
                                     <div data-maas-release-options="tabs[tab].releaseOptions"></div>
diff --git a/src/maasserver/tests/test_node_action.py b/src/maasserver/tests/test_node_action.py
index 67b422f..4cf029e 100644
--- a/src/maasserver/tests/test_node_action.py
+++ b/src/maasserver/tests/test_node_action.py
@@ -694,6 +694,62 @@ class TestDeployAction(MAASServerTestCase):
         self.expectThat(
             node.distro_series, Equals(release_name))
 
+    def test_Deploy_sets_install_kvm_and_osystem_series_if_specified(self):
+        user = factory.make_admin()
+        request = factory.make_fake_request('/')
+        request.user = user
+        node = factory.make_Node(
+            interface=True, status=NODE_STATUS.ALLOCATED,
+            power_type='manual', owner=user)
+        mock_get_curtin_config = self.patch(
+            node_action_module, 'get_curtin_config')
+        mock_node_start = self.patch(node, 'start')
+        mock_validate_os = self.patch(
+            node_action_module, 'validate_osystem_and_distro_series')
+        mock_validate_os.side_effect = lambda os, release: (os, release)
+        mock_validate_hwe = self.patch(
+            node_action_module, 'validate_hwe_kernel')
+        mock_validate_hwe.side_effect = lambda *args, **kwargs: args[0]
+        extra = {
+            "install_kvm": True
+        }
+        Deploy(node, user, request).execute(**extra)
+        self.expectThat(mock_get_curtin_config, MockCalledOnceWith(ANY, node))
+        self.expectThat(mock_node_start, MockCalledOnceWith(user))
+        # Make sure ubuntu/bionic is selected if KVM pod deployment has been
+        # selected.
+        self.expectThat(node.osystem, Equals("ubuntu"))
+        self.expectThat(node.distro_series, Equals("bionic"))
+        self.expectThat(node.install_kvm, Equals(True))
+
+    def test_Deploy_raises_NodeActionError_on_install_kvm_if_os_missing(self):
+        user = factory.make_admin()
+        request = factory.make_fake_request('/')
+        request.user = user
+        node = factory.make_Node(
+            interface=True, status=NODE_STATUS.ALLOCATED,
+            power_type='manual', owner=user)
+        self.patch(node, 'start')
+        extra = {
+            "install_kvm": True
+        }
+        self.assertRaises(
+            NodeActionError, Deploy(node, user, request).execute, **extra)
+
+    def test_Deploy_raises_NodeActionError_if_non_admin_install_kvm(self):
+        user = factory.make_User()
+        request = factory.make_fake_request('/')
+        request.user = user
+        node = factory.make_Node(
+            interface=True, status=NODE_STATUS.ALLOCATED,
+            power_type='manual', owner=user)
+        self.patch(node, 'start')
+        extra = {
+            "install_kvm": True
+        }
+        self.assertRaises(
+            NodeActionError, Deploy(node, user, request).execute, **extra)
+
     def test_Deploy_sets_osystem_and_series_strips_license_key_token(self):
         user = factory.make_User()
         request = factory.make_fake_request('/')