cleanup cloning disk resize

This commit is contained in:
Grant Gongaware 2019-01-08 13:28:43 -08:00
parent aa57556262
commit 30cbef5750
3 changed files with 17 additions and 8 deletions

View File

@ -1,5 +1,5 @@
.PHONY: build clean .PHONY: build clean install
all: build all: build
@ -10,5 +10,11 @@ build: clean
@cd cmd/terraform-provisioner-proxmox && go build @cd cmd/terraform-provisioner-proxmox && go build
@echo "Built terraform-provisioner-proxmox" @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: clean:
@git clean -f -d -X @git clean -f -d -X

View File

@ -21,6 +21,8 @@ Requires https://github.com/Telmate/proxmox-api-go
``` ```
go get github.com/Telmate/proxmox-api-go go get github.com/Telmate/proxmox-api-go
make make
make install
``` ```
Recommended ISO builder https://github.com/Telmate/terraform-ubuntu-proxmox-iso Recommended ISO builder https://github.com/Telmate/terraform-ubuntu-proxmox-iso

View File

@ -620,15 +620,16 @@ func prepareDiskSize(
diskConfMap pxapi.QemuDevices, diskConfMap pxapi.QemuDevices,
) error { ) error {
clonedConfig, err := pxapi.NewConfigQemuFromApi(vmr, client) clonedConfig, err := pxapi.NewConfigQemuFromApi(vmr, client)
for _, diskConf := range diskConfMap { //log.Printf("%s", clonedConfig)
diskID := diskConf["id"].(int) for diskID, diskConf := range diskConfMap {
diskName := fmt.Sprintf("%v%v", diskConf["type"], diskID) diskName := fmt.Sprintf("%v%v", diskConf["type"], diskID)
diskSizeGB := diskConf["size"].(string) //diskSizeGB := diskConf["size"].(string)
diskSize, _ := strconv.ParseFloat(strings.Trim(diskSizeGB, "G"), 64) //diskSize, _ := strconv.ParseFloat(strings.Trim(diskSizeGB, "G"), 64)
if err != nil { diskSize := diskConf["size"].(float64)
return err // if err != nil {
} // return err
// }
if _, diskExists := clonedConfig.QemuDisks[diskID]; !diskExists { if _, diskExists := clonedConfig.QemuDisks[diskID]; !diskExists {
return err return err