Merge ~blake-rouse/maas:fix-1836703 into maas:master

Proposed by Blake Rouse on 2019-07-19
Status: Merged
Approved by: Blake Rouse on 2019-07-19
Approved revision: e6d59f998232deba02c335e2053ddf58898d23c9
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~blake-rouse/maas:fix-1836703
Merge into: maas:master
Diff against target: 50 lines (+27/-3)
1 file modified
src/provisioningserver/drivers/osystem/windows.py (+27/-3)
Reviewer Review Type Date Requested Status
Alberto Donato Approve on 2019-07-19
Adam Collard 2019-07-19 Approve on 2019-07-19
Review via email: mp+370370@code.launchpad.net

Commit message

Fixes LP: #1836703 - Add additional Windows version so license keys can be specified.

To post a comment you must log in.
review: Approve
Alberto Donato (ack) wrote :

lgtm

review: Approve
Alberto Donato (ack) wrote :

lgtm

review: Approve

Update scan failed

At least one of the branches involved have failed to scan. You can manually schedule a rescan if required.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/drivers/osystem/windows.py b/src/provisioningserver/drivers/osystem/windows.py
2index eceb884..f6d81e9 100644
3--- a/src/provisioningserver/drivers/osystem/windows.py
4+++ b/src/provisioningserver/drivers/osystem/windows.py
5@@ -18,6 +18,8 @@ from provisioningserver.drivers.osystem import (
6
7
8 WINDOWS_CHOICES = {
9+ 'win2008r2': 'Windows "Server 2008 R2"',
10+ 'win2008hvr2': 'Windows "Hyper-V Server 2008 R2"',
11 'win2012': 'Windows "Server 2012"',
12 'win2012r2': 'Windows "Server 2012 R2"',
13 'win2012hv': 'Windows "Hyper-V Server 2012"',
14@@ -25,11 +27,33 @@ WINDOWS_CHOICES = {
15 'win2016': 'Windows "Server 2016"',
16 'win2016hv': 'Windows "Hyper-V Server 2016"',
17 'win2016nano': 'Windows "Nano Server 2016"',
18+ 'win2016-core': 'Windows "Server 2016 Core"',
19+ 'win2016dc': 'Windows "Server 2016 Datacenter"',
20+ 'win2016dc-core': 'Windows "Server 2016 Datacenter Core"',
21+ 'win2019': 'Windows "Server 2019"',
22+ 'win2019-core': 'Windows "Server 2019 Core"',
23+ 'win2019dc': 'Windows "Server 2019 Datacenter"',
24+ 'win2019dc-core': 'Windows "Server 2019 Datecenter Core"',
25+ 'win10ent': 'Windows "10 Enterprise"',
26 }
27
28-WINDOWS_DEFAULT = 'win2012hvr2'
29-
30-REQUIRE_LICENSE_KEY = ['win2012', 'win2012r2', 'win2016']
31+WINDOWS_DEFAULT = 'win2019'
32+
33+REQUIRE_LICENSE_KEY = [
34+ 'win2008r2',
35+ 'win2012',
36+ 'win2012r2',
37+ 'win2016',
38+ 'win2016nano',
39+ 'win2016-core',
40+ 'win2016dc',
41+ 'win2016dc-core',
42+ 'win2019',
43+ 'win2019-core',
44+ 'win2019dc',
45+ 'win2019dc-core',
46+ 'win10ent',
47+]
48
49
50 class WindowsOS(OperatingSystem):

Subscribers

People subscribed via source and target branches

to all changes: