F #558: Update docs and goca version with new OSVec

Signed-off-by: Jaime <jconchello@opennebula.io>
OpenNebula · Nov 21, 2024 · e58cbc4 · e58cbc4
1 parent 862fc01
commit e58cbc4
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.5.0 (Unreleased)
+
+FEATURES:
+
+* shared_schemas: Add `machine`, `kernel`, `kernel_ds`, `initrd`, `initrd_ds`, `root`, `kernel_cmd`, `bootloader`, `sd_disk_bus`, `uuid`, `firmware` and `firmware_secure` to OS schema (#558)
+
 # 1.4.1 (October 22nd, 2024)
 
 FEATURES:

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/OpenNebula/terraform-provider-opennebula
 go 1.18
 
 require (
-	github.com/OpenNebula/one/src/oca/go/src/goca v0.0.0-20240528115224-c53e48565a10
+	github.com/OpenNebula/one/src/oca/go/src/goca v0.0.0-20241120172129-bb65c2242412
 	github.com/hashicorp/go-uuid v1.0.3
 	github.com/hashicorp/go-version v1.6.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1

diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
 github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
-github.com/OpenNebula/one/src/oca/go/src/goca v0.0.0-20240528115224-c53e48565a10 h1:g++kihIwzRFwxAV6fQzvwsEP6/l9ej8G/tixWaNBc1M=
-github.com/OpenNebula/one/src/oca/go/src/goca v0.0.0-20240528115224-c53e48565a10/go.mod h1:dvAwZi1Aol7eu6BENzHtl8ztGBkacB9t/fJj+fYk+Xg=
+github.com/OpenNebula/one/src/oca/go/src/goca v0.0.0-20241120172129-bb65c2242412 h1:CUdtKmQcq03A3ludh8AMp+g2NpUdizZU7E7fuuzLzo8=
+github.com/OpenNebula/one/src/oca/go/src/goca v0.0.0-20241120172129-bb65c2242412/go.mod h1:dvAwZi1Aol7eu6BENzHtl8ztGBkacB9t/fJj+fYk+Xg=
 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C67SkzkDfmQuVln04ygHj3vjZfd9FL+GmQQ=
 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
 github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=

diff --git a/website/docs/r/template.html.markdown b/website/docs/r/template.html.markdown
@@ -128,6 +128,19 @@ The following arguments are supported:
 
 * `arch` - (Required) Hardware architecture of the Virtual machine. Must fit the host architecture.
 * `boot` - (Optional) `OS` disk to use to boot on.
+* `machine` - (Optional) libvirt machine type.
+* `kernel` - (Optional) Path to the `OS` kernel to boot the image in the host.
+* `kernel_ds` - (Optional) Image to be used as kernel. (see !!)
+* `initrd` - (Optional) Path to the initrd image in the host.
+* `initrd_ds` - (Optional) Image to be used as ramdisk. (see !!)
+* `root` - (Optional) Device to be mounted as root.
+* `kernel_cmd` - (Optional) Arguments for the booting kernel.
+* `bootloader` - (Optional) Path to the bootloader executable.
+* `sd_disk_bus` - (Optional) Bus for disks with sd prefix, either `scsi` or `sata`, if attribute is missing, libvirt chooses itself.
+* `uuid` - (Optional) Unique ID of the VM.
+* `firmware` - (Optional) Firmware type or firmware path. Possible values: `BIOS` or path for KVM, `BIOS` or `UEFI` for vCenter.
+* `firmware_secure` - (Optional) Enable Secure Boot. (Can be `true` or `false`).
+* (!!) Use one of `kernel_ds` or `kernel` (and `initrd` or `initrd_ds`).
 
 ### Features parameters
 

diff --git a/website/docs/r/virtual_machine.html.markdown b/website/docs/r/virtual_machine.html.markdown
@@ -129,6 +129,19 @@ The following arguments are supported:
 
 * `arch` - (Required) Hardware architecture of the Virtual machine. Must fit the host architecture.
 * `boot` - (Optional) `OS` disk to use to boot on.
+* `machine` - (Optional) libvirt machine type.
+* `kernel` - (Optional) Path to the `OS` kernel to boot the image in the host.
+* `kernel_ds` - (Optional) Image to be used as kernel. (see !!)
+* `initrd` - (Optional) Path to the initrd image in the host.
+* `initrd_ds` - (Optional) Image to be used as ramdisk. (see !!)
+* `root` - (Optional) Device to be mounted as root.
+* `kernel_cmd` - (Optional) Arguments for the booting kernel.
+* `bootloader` - (Optional) Path to the bootloader executable.
+* `sd_disk_bus` - (Optional) Bus for disks with sd prefix, either `scsi` or `sata`, if attribute is missing, libvirt chooses itself.
+* `uuid` - (Optional) Unique ID of the VM.
+* `firmware` - (Optional) Firmware type or firmware path. Possible values: `BIOS` or path for KVM, `BIOS` or `UEFI` for vCenter.
+* `firmware_secure` - (Optional) Enable Secure Boot. (Can be `true` or `false`).
+* (!!) Use one of `kernel_ds` or `kernel` (and `initrd` or `initrd_ds`).
 
 ### Disk parameters
 

diff --git a/website/docs/r/virtual_router_instance.markdown b/website/docs/r/virtual_router_instance.markdown
@@ -118,6 +118,19 @@ The following arguments are supported:
 
 * `arch` - (Required) Hardware architecture of the virtual router instance. Must fit the host architecture.
 * `boot` - (Optional) `OS` disk to use to boot on.
+* `machine` - (Optional) libvirt machine type.
+* `kernel` - (Optional) Path to the `OS` kernel to boot the image in the host.
+* `kernel_ds` - (Optional) Image to be used as kernel. (see !!)
+* `initrd` - (Optional) Path to the initrd image in the host.
+* `initrd_ds` - (Optional) Image to be used as ramdisk. (see !!)
+* `root` - (Optional) Device to be mounted as root.
+* `kernel_cmd` - (Optional) Arguments for the booting kernel.
+* `bootloader` - (Optional) Path to the bootloader executable.
+* `sd_disk_bus` - (Optional) Bus for disks with sd prefix, either `scsi` or `sata`, if attribute is missing, libvirt chooses itself.
+* `uuid` - (Optional) Unique ID of the VM.
+* `firmware` - (Optional) Firmware type or firmware path. Possible values: `BIOS` or path for KVM, `BIOS` or `UEFI` for vCenter.
+* `firmware_secure` - (Optional) Enable Secure Boot. (Can be `true` or `false`).
+* (!!) Use one of `kernel_ds` or `kernel` (and `initrd` or `initrd_ds`).
 
 ### Disk parameters
 

diff --git a/website/docs/r/virtual_router_instance_template.markdown b/website/docs/r/virtual_router_instance_template.markdown
@@ -88,6 +88,19 @@ resource "opennebula_virtual_router_instance_template" "example" {
 
 * `arch` - (Required) Hardware architecture of the Virtual machine. Must fit the host architecture.
 * `boot` - (Optional) `OS` disk to use to boot on.
+* `machine` - (Optional) libvirt machine type.
+* `kernel` - (Optional) Path to the `OS` kernel to boot the image in the host.
+* `kernel_ds` - (Optional) Image to be used as kernel. (see !!)
+* `initrd` - (Optional) Path to the initrd image in the host.
+* `initrd_ds` - (Optional) Image to be used as ramdisk. (see !!)
+* `root` - (Optional) Device to be mounted as root.
+* `kernel_cmd` - (Optional) Arguments for the booting kernel.
+* `bootloader` - (Optional) Path to the bootloader executable.
+* `sd_disk_bus` - (Optional) Bus for disks with sd prefix, either `scsi` or `sata`, if attribute is missing, libvirt chooses itself.
+* `uuid` - (Optional) Unique ID of the VM.
+* `firmware` - (Optional) Firmware type or firmware path. Possible values: `BIOS` or path for KVM, `BIOS` or `UEFI` for vCenter.
+* `firmware_secure` - (Optional) Enable Secure Boot. (Can be `true` or `false`).
+* (!!) Use one of `kernel_ds` or `kernel` (and `initrd` or `initrd_ds`).
 
 ### Features parameters