Merge ~steverydz/maas:deploy-options-os into maas:master

[Steve Rydz]

LP: #1776741 - Fix toggle between deploy os

[Lilyana Videnova (lilyanavidenova)]

UX +1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b deploy-options-os lp:~steverydz/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 7f18296591465baa944504dbc88877fed20e538b

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b deploy-options-os lp:~steverydz/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4844/console
COMMIT: 0bea9c19a3de4dc7bc389eb6700f1806e624171e

review: Needs Fixing

[Alberto Donato (ack)]

+1 lgtm.

there's a lint issue to fix for CI to be green, though

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b deploy-options-os lp:~steverydz/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 911863882a85434783bb407e073e0656c2f33830

review: Approve

diff --git a/src/maasserver/static/js/angular/directives/os_select.js b/src/maasserver/static/js/angular/directives/os_select.js
index 551ddb1..3af32f1 100644
--- a/src/maasserver/static/js/angular/directives/os_select.js
+++ b/src/maasserver/static/js/angular/directives/os_select.js
@@ -189,12 +189,7 @@ angular.module('MAAS').directive('maasOsSelect', ['KVMDeployOSBlacklist',
                 $scope.ngModel.hwe_kernel = null;
                 if($scope.releases.length > 0) {
                     var firstRelease = $scope.releases[0][0];
-                    if (firstRelease.includes('ubuntu') &&
-                        KVMDeployOSBlacklist.includes(firstRelease)) {
-                            setDefault();
-                    } else {
-                        $scope.ngModel.release = firstRelease;
-                    }
+                    $scope.ngModel.release = firstRelease;
                 }
 
                 $scope.hwe_kernels = getSelectableKernels();
diff --git a/src/maasserver/static/js/angular/directives/tests/test_os_select.js b/src/maasserver/static/js/angular/directives/tests/test_os_select.js
index c491dc1..c111a0a 100644
--- a/src/maasserver/static/js/angular/directives/tests/test_os_select.js
+++ b/src/maasserver/static/js/angular/directives/tests/test_os_select.js
@@ -203,6 +203,29 @@ describe("maasOsSelect", function() {
                 $scope.osinfo.osystems[0][0], $scope.osinfo.releases));
     });
 
+    it("selectedOSChanged works on non-ubuntu os", function() {
+        var directive = compileDirective("osinfo", "selected");
+        $scope.osinfo = {
+            osystems: [["centos", "CentOS"], ["ubuntu", "Ubuntu"]],
+            releases: [
+                ["centos/centos66", "CentOS 6"],
+                ["centos/centos70", "CentOS 7"],
+                ["ubuntu/xenial", "16.04 LTS \"Xenial Xerus\""],
+                ["ubuntu/bionic", "18.04 LTS \"Bionic Beaver\""]
+            ],
+            default_osystem: "centos",
+            default_release: "centos66"
+        };
+        $scope.selected = {
+            osystem: "ubuntu",
+            release: ""
+        };
+        $scope.$digest();
+        directive.isolateScope().selectedOSChanged();
+        expect(directive.isolateScope().releases[0][0])
+            .toEqual('ubuntu/xenial');
+    });
+
     it("selectedOSChanged updates releases", function() {
         var directive = compileDirective("osinfo", "selected");
         $scope.selected = {