mirrors/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/bpg/terraform-provider-proxmox.git synced 2025-07-04 12:32:59 +00:00
Code

fix(lxc): use default rootfs size (4Gb) prevents creation of mount points (#1398)

Browse Source 
Signed-off-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>
This commit is contained in:
Pavel Boldyrev 2024-06-16 23:47:50 -04:00 committed by GitHub
parent cc7fc63ec1
commit 4a8bf8da27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/resource_virtual_environment_container.tf
View File

@ -5,7 +5,7 @@ resource "proxmox_virtual_environment_container" "example_template" {
disk { disk {
datastore_id = element(data.proxmox_virtual_environment_datastores.example.datastore_ids, index(data.proxmox_virtual_environment_datastores.example.datastore_ids, "local-lvm")) datastore_id = element(data.proxmox_virtual_environment_datastores.example.datastore_ids, index(data.proxmox_virtual_environment_datastores.example.datastore_ids, "local-lvm"))
size = 10 size = 4
} }
mount_point { mount_point {

8
fwprovider/test/resource_container_test.go
View File

@ -67,7 +67,13 @@ resource "proxmox_virtual_environment_container" "test_container" {
disk { disk {
datastore_id = "local-lvm" datastore_id = "local-lvm"
size = 8 size = 4
}
mount_point {
volume = "local-lvm"
size = "4G"
path = "mnt/local"
} }
description = <<-EOT description = <<-EOT

22
proxmoxtf/resource/container/container.go
View File

@ -1384,17 +1384,6 @@ func containerCreateCustom(ctx context.Context, d *schema.ResourceData, m interf
diskDatastoreID := diskBlock[mkDiskDatastoreID].(string) diskDatastoreID := diskBlock[mkDiskDatastoreID].(string)
var rootFS *containers.CustomRootFS
diskSize := diskBlock[mkDiskSize].(int)
if diskSize != dvDiskSize && diskDatastoreID != "" {
// This is a special case where the rootfs size is set to a non-default value at creation time.
// see https://pve.proxmox.com/pve-docs/chapter-pct.html#_storage_backed_mount_points
rootFS = &containers.CustomRootFS{
Volume: fmt.Sprintf("%s:%d", diskDatastoreID, diskSize),
}
}
features, err := containerGetFeatures(container, d) features, err := containerGetFeatures(container, d)
if err != nil { if err != nil {
return diag.FromErr(err) return diag.FromErr(err)
@ -1594,6 +1583,17 @@ func containerCreateCustom(ctx context.Context, d *schema.ResourceData, m interf
mountPointArray = append(mountPointArray, mountPointObject) mountPointArray = append(mountPointArray, mountPointObject)
} }
var rootFS *containers.CustomRootFS
diskSize := diskBlock[mkDiskSize].(int)
if diskDatastoreID != "" && (diskSize != dvDiskSize || len(mountPointArray) > 0) {
// This is a special case where the rootfs size is set to a non-default value at creation time.
// see https://pve.proxmox.com/pve-docs/chapter-pct.html#_storage_backed_mount_points
rootFS = &containers.CustomRootFS{
Volume: fmt.Sprintf("%s:%d", diskDatastoreID, diskSize),
}
}
networkInterface := d.Get(mkNetworkInterface).([]interface{}) networkInterface := d.Get(mkNetworkInterface).([]interface{})
networkInterfaceArray := make(containers.CustomNetworkInterfaceArray, len(networkInterface)) networkInterfaceArray := make(containers.CustomNetworkInterfaceArray, len(networkInterface))