mirror of
https://github.com/bpg/terraform-provider-proxmox.git
synced 2025-06-30 18:42:58 +00:00
feat: add more valid cpu types (#411)
* add more valid cpu types (cherry picked from commit c62e76707b897912628adc7dda0871b3146c7aa8) * add docs --------- Co-authored-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>
This commit is contained in:
parent
4147ff6a29
commit
e9a9fd76da
@ -167,16 +167,20 @@ output "ubuntu_vm_public_key" {
|
|||||||
to `0`).
|
to `0`).
|
||||||
- `numa` - (Boolean) Enable/disable NUMA. (default to `false`)
|
- `numa` - (Boolean) Enable/disable NUMA. (default to `false`)
|
||||||
- `sockets` - (Optional) The number of CPU sockets (defaults to `1`).
|
- `sockets` - (Optional) The number of CPU sockets (defaults to `1`).
|
||||||
- `type` - (Optional) The emulated CPU type (defaults to `qemu64`).
|
- `type` - (Optional) The emulated CPU type, it's recommended to use `x86-64-v2-AES` (defaults to `qemu64`).
|
||||||
- `486` - Intel 486.
|
- `486` - Intel 486.
|
||||||
- `Broadwell`/`Broadwell-IBRS`/`Broadwell-noTSX`/`Broadwell-noTSX-IBRS`
|
- `Broadwell`/`Broadwell-IBRS`/`Broadwell-noTSX`/`Broadwell-noTSX-IBRS` - Intel Core Processor (Broadwell,
|
||||||
- Intel Core Processor (Broadwell, 2014).
|
2014).
|
||||||
- `Cascadelake-Server` - Intel Xeon 32xx/42xx/52xx/62xx/82xx/92xx (
|
- `Cascadelake-Server`/`Cascadelake-Server-noTSX`/`Cascadelake-Server-v2`/`Cascadelake-Server-v4`/`Cascadelake-Server-v5` -
|
||||||
|
Intel Xeon 32xx/42xx/52xx/62xx/82xx/92xx (
|
||||||
2019).
|
2019).
|
||||||
- `Conroe` - Intel Celeron_4x0 (Conroe/Merom Class Core 2, 2006).
|
- `Conroe` - Intel Celeron_4x0 (Conroe/Merom Class Core 2, 2006).
|
||||||
- `EPYC`/`EPYC-IBPB` - AMD EPYC Processor (2017).
|
- `Cooperlake`/`Cooperlake-v2`
|
||||||
|
- `EPYC`/`EPYC-IBPB`/`EPYC-Milan`/`EPYC-Rome`/`EPYC-Rome-v2`/`EPYC-v3` - AMD EPYC Processor (2017).
|
||||||
- `Haswell`/`Haswell-IBRS`/`Haswell-noTSX`/`Haswell-noTSX-IBRS` - Intel
|
- `Haswell`/`Haswell-IBRS`/`Haswell-noTSX`/`Haswell-noTSX-IBRS` - Intel
|
||||||
Core Processor (Haswell, 2013).
|
Core Processor (Haswell, 2013).
|
||||||
|
- `Icelake-Client`/`Icelake-Client-noTSX`
|
||||||
|
- `Icelake-Server`/`Icelake-Server-noTSX`/`Icelake-Server-v3`/`Icelake-Server-v4`/`Icelake-Server-v5`/`Icelake-Server-v6`
|
||||||
- `IvyBridge`/`IvyBridge-IBRS` - Intel Xeon E3-12xx v2 (Ivy Bridge,
|
- `IvyBridge`/`IvyBridge-IBRS` - Intel Xeon E3-12xx v2 (Ivy Bridge,
|
||||||
2012).
|
2012).
|
||||||
- `KnightsMill` - Intel Xeon Phi 72xx (2017).
|
- `KnightsMill` - Intel Xeon Phi 72xx (2017).
|
||||||
@ -190,9 +194,12 @@ output "ubuntu_vm_public_key" {
|
|||||||
- `Penryn` - Intel Core 2 Duo P9xxx (Penryn Class Core 2, 2007).
|
- `Penryn` - Intel Core 2 Duo P9xxx (Penryn Class Core 2, 2007).
|
||||||
- `SandyBridge`/`SandyBridge-IBRS` - Intel Xeon E312xx (Sandy Bridge,
|
- `SandyBridge`/`SandyBridge-IBRS` - Intel Xeon E312xx (Sandy Bridge,
|
||||||
2011).
|
2011).
|
||||||
- `Skylake-Client`/`Skylake-Client-IBRS` - Intel Core Processor (
|
- `SapphireRapids`
|
||||||
|
- `Skylake-Client`/`Skylake-Client-IBRS`/`Skylake-Client-noTSX-IBRS`/`Skylake-Client-v4` - Intel Core
|
||||||
|
Processor (
|
||||||
Skylake, 2015).
|
Skylake, 2015).
|
||||||
- `Skylake-Server`/`Skylake-Server-IBRS` - Intel Xeon Processor (
|
- `Skylake-Server`/`Skylake-Server-IBRS`/`Skylake-Server-noTSX-IBRS`/`Skylake-Server-v4`/`Skylake-Server-v5` -
|
||||||
|
Intel Xeon Processor (
|
||||||
Skylake, 2016).
|
Skylake, 2016).
|
||||||
- `Westmere`/`Westmere-IBRS` - Intel Westmere E56xx/L56xx/X56xx (
|
- `Westmere`/`Westmere-IBRS` - Intel Westmere E56xx/L56xx/X56xx (
|
||||||
Nehalem-C, 2010).
|
Nehalem-C, 2010).
|
||||||
@ -208,6 +215,7 @@ output "ubuntu_vm_public_key" {
|
|||||||
- `phenom` - AMD Phenom (2010).
|
- `phenom` - AMD Phenom (2010).
|
||||||
- `qemu32`/`qemu64` - QEMU Virtual CPU version 2.5+ (32 & 64 bit
|
- `qemu32`/`qemu64` - QEMU Virtual CPU version 2.5+ (32 & 64 bit
|
||||||
variants).
|
variants).
|
||||||
|
- `x86-64-v2`/`x86-64-v2-AES`/`x86-64-v3`/`x86-64-v4` See https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels
|
||||||
- `custom-<model>` - Custom CPU model. All `custom-<model>` values
|
- `custom-<model>` - Custom CPU model. All `custom-<model>` values
|
||||||
should be defined in `/etc/pve/virtual-guest/cpu-models.conf` file.
|
should be defined in `/etc/pve/virtual-guest/cpu-models.conf` file.
|
||||||
- `units` - (Optional) The CPU units (defaults to `1024`).
|
- `units` - (Optional) The CPU units (defaults to `1024`).
|
||||||
|
@ -105,13 +105,31 @@ func getCPUTypeValidator() schema.SchemaValidateDiagFunc {
|
|||||||
"Broadwell-noTSX",
|
"Broadwell-noTSX",
|
||||||
"Broadwell-noTSX-IBRS",
|
"Broadwell-noTSX-IBRS",
|
||||||
"Cascadelake-Server",
|
"Cascadelake-Server",
|
||||||
|
"Cascadelake-Server-noTSX",
|
||||||
|
"Cascadelake-Server-v2",
|
||||||
|
"Cascadelake-Server-v4",
|
||||||
|
"Cascadelake-Server-v5",
|
||||||
"Conroe",
|
"Conroe",
|
||||||
|
"Cooperlake",
|
||||||
|
"Cooperlake-v2",
|
||||||
"EPYC",
|
"EPYC",
|
||||||
"EPYC-IBPB",
|
"EPYC-IBPB",
|
||||||
|
"EPYC-Milan",
|
||||||
|
"EPYC-Rome",
|
||||||
|
"EPYC-Rome-v2",
|
||||||
|
"EPYC-v3",
|
||||||
"Haswell",
|
"Haswell",
|
||||||
"Haswell-IBRS",
|
"Haswell-IBRS",
|
||||||
"Haswell-noTSX",
|
"Haswell-noTSX",
|
||||||
"Haswell-noTSX-IBRS",
|
"Haswell-noTSX-IBRS",
|
||||||
|
"Icelake-Client",
|
||||||
|
"Icelake-Client-noTSX",
|
||||||
|
"Icelake-Server",
|
||||||
|
"Icelake-Server-noTSX",
|
||||||
|
"Icelake-Server-v3",
|
||||||
|
"Icelake-Server-v4",
|
||||||
|
"Icelake-Server-v5",
|
||||||
|
"Icelake-Server-v6",
|
||||||
"IvyBridge",
|
"IvyBridge",
|
||||||
"IvyBridge-IBRS",
|
"IvyBridge-IBRS",
|
||||||
"KnightsMill",
|
"KnightsMill",
|
||||||
@ -125,10 +143,16 @@ func getCPUTypeValidator() schema.SchemaValidateDiagFunc {
|
|||||||
"Penryn",
|
"Penryn",
|
||||||
"SandyBridge",
|
"SandyBridge",
|
||||||
"SandyBridge-IBRS",
|
"SandyBridge-IBRS",
|
||||||
|
"SapphireRapids",
|
||||||
"Skylake-Client",
|
"Skylake-Client",
|
||||||
"Skylake-Client-IBRS",
|
"Skylake-Client-IBRS",
|
||||||
|
"Skylake-Client-noTSX-IBRS",
|
||||||
|
"Skylake-Client-v4",
|
||||||
"Skylake-Server",
|
"Skylake-Server",
|
||||||
"Skylake-Server-IBRS",
|
"Skylake-Server-IBRS",
|
||||||
|
"Skylake-Server-noTSX-IBRS",
|
||||||
|
"Skylake-Server-v4",
|
||||||
|
"Skylake-Server-v5",
|
||||||
"Westmere",
|
"Westmere",
|
||||||
"Westmere-IBRS",
|
"Westmere-IBRS",
|
||||||
"athlon",
|
"athlon",
|
||||||
@ -144,6 +168,10 @@ func getCPUTypeValidator() schema.SchemaValidateDiagFunc {
|
|||||||
"phenom",
|
"phenom",
|
||||||
"qemu32",
|
"qemu32",
|
||||||
"qemu64",
|
"qemu64",
|
||||||
|
"x86-64-v2",
|
||||||
|
"x86-64-v2-AES",
|
||||||
|
"x86-64-v3",
|
||||||
|
"x86-64-v4",
|
||||||
}
|
}
|
||||||
|
|
||||||
return validation.ToDiagFunc(validation.Any(
|
return validation.ToDiagFunc(validation.Any(
|
||||||
|
Loading…
Reference in New Issue
Block a user