diff --git a/Makefile b/Makefile index 396aa67..ab322fd 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -.PHONY: build clean +.PHONY: build clean install all: build @@ -10,5 +10,11 @@ build: clean @cd cmd/terraform-provisioner-proxmox && go build @echo "Built terraform-provisioner-proxmox" + +install: clean + @echo " -> Installing" + go install github.com/Telmate/terraform-provider-proxmox/cmd/terraform-provider-proxmox + go install github.com/Telmate/terraform-provider-proxmox/cmd/terraform-provisioner-proxmox + clean: @git clean -f -d -X diff --git a/README.md b/README.md index 0921525..6695ca2 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ Requires https://github.com/Telmate/proxmox-api-go ``` go get github.com/Telmate/proxmox-api-go make + +make install ``` Recommended ISO builder https://github.com/Telmate/terraform-ubuntu-proxmox-iso diff --git a/proxmox/resource_vm_qemu.go b/proxmox/resource_vm_qemu.go index 4578d14..6951210 100644 --- a/proxmox/resource_vm_qemu.go +++ b/proxmox/resource_vm_qemu.go @@ -620,15 +620,16 @@ func prepareDiskSize( diskConfMap pxapi.QemuDevices, ) error { clonedConfig, err := pxapi.NewConfigQemuFromApi(vmr, client) - for _, diskConf := range diskConfMap { - diskID := diskConf["id"].(int) + //log.Printf("%s", clonedConfig) + for diskID, diskConf := range diskConfMap { diskName := fmt.Sprintf("%v%v", diskConf["type"], diskID) - diskSizeGB := diskConf["size"].(string) - diskSize, _ := strconv.ParseFloat(strings.Trim(diskSizeGB, "G"), 64) - if err != nil { - return err - } + //diskSizeGB := diskConf["size"].(string) + //diskSize, _ := strconv.ParseFloat(strings.Trim(diskSizeGB, "G"), 64) + diskSize := diskConf["size"].(float64) + // if err != nil { + // return err + // } if _, diskExists := clonedConfig.QemuDisks[diskID]; !diskExists { return err