From 0bcfefd0bc195b0382244ef2ecc6fa9c93a404d9 Mon Sep 17 00:00:00 2001 From: Calle Pettersson Date: Mon, 15 Jun 2020 14:00:32 +0200 Subject: [PATCH] Update Proxmox storagePoolTypes (#9418) --- builder/proxmox/config.go | 6 +++--- website/pages/docs/builders/proxmox.mdx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/proxmox/config.go b/builder/proxmox/config.go index 92b6b9cef..5bc3dc920 100644 --- a/builder/proxmox/config.go +++ b/builder/proxmox/config.go @@ -173,10 +173,10 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) { log.Printf("Disk %d cache mode not set, using default 'none'", idx) c.Disks[idx].CacheMode = "none" } - // For any storage pool types which aren't in rxStorageTypes in proxmox-api/proxmox/config_qemu.go:651 - // (currently zfspool and lvm), the format parameter is mandatory. Make sure this is still up to date + // For any storage pool types which aren't in rxStorageTypes in proxmox-api/proxmox/config_qemu.go:890 + // (currently zfspool|lvm|rbd|cephfs), the format parameter is mandatory. Make sure this is still up to date // when updating the vendored code! - if !contains([]string{"zfspool", "lvm"}, c.Disks[idx].StoragePoolType) && c.Disks[idx].DiskFormat == "" { + if !contains([]string{"zfspool", "lvm", "rbd", "cephfs"}, c.Disks[idx].StoragePoolType) && c.Disks[idx].DiskFormat == "" { errs = packer.MultiErrorAppend(errs, errors.New(fmt.Sprintf("disk format must be specified for pool type %q", c.Disks[idx].StoragePoolType))) } } diff --git a/website/pages/docs/builders/proxmox.mdx b/website/pages/docs/builders/proxmox.mdx index 944d5007f..00eeb0700 100644 --- a/website/pages/docs/builders/proxmox.mdx +++ b/website/pages/docs/builders/proxmox.mdx @@ -157,7 +157,7 @@ builder. by the installer, for example. - `storage_pool_type` (string) - Required. The type of the pool, can - be `lvm`, `lvm-thin`, `zfspool` or `directory`. + be `lvm`, `lvm-thin`, `zfspool`, `cephfs`, `rbd` or `directory`. - `type` (string) - The type of disk. Can be `scsi`, `sata`, `virtio` or `ide`. Defaults to `scsi`.