fix(lxc): allow container creation/update with correct mountoptions (#2319)

* fix: allow container creation with correct mountoptions

Signed-off-by: Alexander Petermann <alex@petermann.dev>

* fix: use current rootFS Volume in containerUpdate

Signed-off-by: Alexander Petermann <alex@petermann.dev>

* add acceptance test

Signed-off-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>

* cleanup

Signed-off-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>

---------

Signed-off-by: Alexander Petermann <alex@petermann.dev>
Signed-off-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>
Co-authored-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>

Author: lexxxel

fwprovider/test/resource_container_test.go

@@ -221,6 +221,124 @@ func TestAccResourceContainer(t *testing.T) {
 	})
 }
 
+func TestAccResourceContainerMountOptions(t *testing.T) {
+	te := InitEnvironment(t)
+	imageFileName := fmt.Sprintf("%d-alpine-3.22-default_20250617_amd64.tar.xz", time.Now().UnixMicro())
+	testAccDownloadContainerTemplate(t, te, imageFileName)
+
+	accTestContainerID := 100000 + rand.Intn(99999)
+
+	te.AddTemplateVars(map[string]interface{}{
+		"ImageFileName":   imageFileName,
+		"TestContainerID": accTestContainerID,
+		"TimeoutDelete":   300,
+	})
+
+	resource.ParallelTest(t, resource.TestCase{
+		ProtoV6ProviderFactories: te.AccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: te.RenderConfig(`
+				resource "proxmox_virtual_environment_container" "test_container" {
+					node_name = "{{.NodeName}}"
+					vm_id     = {{.TestContainerID}}
+					timeout_delete = {{ .TimeoutDelete }}
+					unprivileged = true
+					disk {
+						datastore_id = "local-lvm"
+						size         = 4
+						mount_options = ["lazytime"]
+					}
+					initialization {
+						hostname = "test-mount-options"
+						ip_config {
+							ipv4 {
+								address = "dhcp"
+							}
+						}
+					}
+					network_interface {
+						name = "vmbr0"
+					}
+					operating_system {
+						template_file_id = "local:vztmpl/{{.ImageFileName}}"
+						type             = "alpine"
+					}
+				}`, WithRootUser()),
+				Check: resource.ComposeTestCheckFunc(
+					ResourceAttributes(accTestContainerName, map[string]string{
+						"disk.0.mount_options.#": "1",
+						"disk.0.mount_options.0": "lazytime",
+					}),
+					func(*terraform.State) error {
+						ct := te.NodeClient().Container(accTestContainerID)
+
+						ctInfo, err := ct.GetContainer(t.Context())
+						require.NoError(te.t, err, "failed to get container")
+
+						require.NotNil(te.t, ctInfo.RootFS, "rootfs should not be nil")
+						require.NotNil(te.t, ctInfo.RootFS.MountOptions, "mount_options should not be nil on initial creation")
+						require.Len(te.t, *ctInfo.RootFS.MountOptions, 1, "mount_options should have 1 element on initial creation")
+						require.Equal(te.t, "lazytime", (*ctInfo.RootFS.MountOptions)[0], "mount_options should contain 'lazytime'")
+
+						te.t.Logf("Container created with rootFS volume: %s", ctInfo.RootFS.Volume)
+
+						return nil
+					},
+				),
+			},
+			{
+				Config: te.RenderConfig(`
+				resource "proxmox_virtual_environment_container" "test_container" {
+					node_name = "{{.NodeName}}"
+					vm_id     = {{.TestContainerID}}
+					timeout_delete = {{ .TimeoutDelete }}
+					unprivileged = true
+					disk {
+						datastore_id = "local-lvm"
+						size         = 4
+						mount_options = ["lazytime", "noatime"]
+					}
+					initialization {
+						hostname = "test-mount-options"
+						ip_config {
+							ipv4 {
+								address = "dhcp"
+							}
+						}
+					}
+					network_interface {
+						name = "vmbr0"
+					}
+					operating_system {
+						template_file_id = "local:vztmpl/{{.ImageFileName}}"
+						type             = "alpine"
+					}
+				}`, WithRootUser()),
+				Check: resource.ComposeTestCheckFunc(
+					ResourceAttributes(accTestContainerName, map[string]string{
+						"disk.0.mount_options.#": "2",
+					}),
+					func(*terraform.State) error {
+						ct := te.NodeClient().Container(accTestContainerID)
+
+						ctInfo, err := ct.GetContainer(t.Context())
+						require.NoError(te.t, err, "failed to get container")
+
+						require.NotNil(te.t, ctInfo.RootFS, "rootfs should not be nil")
+						require.NotNil(te.t, ctInfo.RootFS.MountOptions, "mount_options should not be nil after update")
+						require.Len(te.t, *ctInfo.RootFS.MountOptions, 2, "mount_options should have 2 elements after update")
+
+						te.t.Logf("After update, rootFS volume: %s", ctInfo.RootFS.Volume)
+
+						return nil
+					},
+				),
+			},
+		},
+	})
+}
+
 func TestAccResourceContainerClone(t *testing.T) {
 	te := InitEnvironment(t)
 	accTestContainerID := 100000 + rand.Intn(99999)

proxmoxtf/resource/container/container.go

@@ -1765,7 +1765,7 @@ func containerCreateCustom(ctx context.Context, d *schema.ResourceData, m interf
 	}
 
 	diskSize := diskBlock[mkDiskSize].(int)
-	if diskDatastoreID != "" && (diskSize != dvDiskSize || len(mountPoints) > 0) {
+	if diskDatastoreID != "" && (diskSize != dvDiskSize || len(mountPoints) > 0 || len(diskMountOptions) > 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{
@@ -2979,11 +2979,13 @@ func containerUpdate(ctx context.Context, d *schema.ResourceData, m interface{})
 		}
 
 		rootFS := &containers.CustomRootFS{}
-		// Disk ID for the rootfs is always 0
-		diskID := 0
-		vmID := d.Get(mkVMID).(int)
-		rootFS.Volume = diskBlock[mkDiskDatastoreID].(string)
-		rootFS.Volume = getContainerDiskVolume(rootFS.Volume, vmID, diskID)
+
+		containerConfig, e := containerAPI.GetContainer(ctx)
+		if e != nil {
+			return diag.FromErr(e)
+		}
+
+		rootFS.Volume = containerConfig.RootFS.Volume
 
 		acl := types.CustomBool(diskBlock[mkDiskACL].(bool))
 		mountOptions := diskBlock[mkDiskMountOptions].([]interface{})
@@ -3534,10 +3536,6 @@ func parseImportIDWithNodeName(id string) (string, string, error) {
 	return nodeName, id, nil
 }
 
-func getContainerDiskVolume(rawVolume string, vmID int, diskID int) string {
-	return fmt.Sprintf("%s:vm-%d-disk-%d", rawVolume, vmID, diskID)
-}
-
 func skipDnsDiffIfEmpty(k, oldValue, newValue string, d *schema.ResourceData) bool {
 	dnsDataKey := mkInitialization + ".0." + mkInitializationDNS
 	if k == dnsDataKey+".#" {