mirrors/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/bpg/terraform-provider-proxmox.git synced 2025-07-10 07:45:02 +00:00
Code

feat(vm): update VM disc import logic (#241)

Browse Source 
* feat(vm): updated VM disc import logic

fixes: #187, #203

* ignore linter error
This commit is contained in:
Pavel Boldyrev 2023-02-17 16:53:06 -05:00 committed by GitHub
parent 197c9e5152
commit fcf9810252
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/resource_virtual_environment_vm.tf
View File

@ -23,7 +23,7 @@ resource "proxmox_virtual_environment_vm" "example_template" {
discard = "on" discard = "on"
ssd = true ssd = true
} }
#
# disk { # disk {
# datastore_id = "nfs" # datastore_id = "nfs"
# interface = "scsi1" # interface = "scsi1"

3
proxmox/virtual_environment_nodes.go
View File

@ -41,10 +41,11 @@ func (c *VirtualEnvironmentClient) ExecuteNodeCommands(
} }
defer closeOrLogError(sshSession) defer closeOrLogError(sshSession)
script := strings.Join(commands, " && \\\n")
output, err := sshSession.CombinedOutput( output, err := sshSession.CombinedOutput(
fmt.Sprintf( fmt.Sprintf(
"/bin/bash -c '%s'", "/bin/bash -c '%s'",
strings.ReplaceAll(strings.Join(commands, " && \\\n"), "'", "'\"'\"'"), strings.ReplaceAll(script, "'", "'\"'\"'"),
), ),
) )
if err != nil { if err != nil {

33
proxmoxtf/resource_virtual_environment_vm.go
View File

@ -2088,7 +2088,7 @@ func resourceVirtualEnvironmentVMCreateCustomDisks(
// Generate the commands required to import the specified disks. // Generate the commands required to import the specified disks.
importedDiskCount := 0 importedDiskCount := 0
for i, d := range disk { for _, d := range disk {
block := d.(map[string]interface{}) block := d.(map[string]interface{})
fileID, _ := block[mkResourceVirtualEnvironmentVMDiskFileID].(string) fileID, _ := block[mkResourceVirtualEnvironmentVMDiskFileID].(string)
@ -2150,15 +2150,6 @@ func resourceVirtualEnvironmentVMCreateCustomDisks(
diskOptions += fmt.Sprintf(",mbps_wr_max=%d", speedLimitWriteBurstable) diskOptions += fmt.Sprintf(",mbps_wr_max=%d", speedLimitWriteBurstable)
} }
fileIDParts := strings.Split(fileID, ":")
filePath := ""
if strings.HasPrefix(fileIDParts[1], "iso/") {
filePath = fmt.Sprintf("/template/%s", fileIDParts[1])
} else {
filePath = fmt.Sprintf("/%s", fileIDParts[1])
}
filePathTmp := fmt.Sprintf( filePathTmp := fmt.Sprintf(
"/tmp/vm-%d-disk-%d.%s", "/tmp/vm-%d-disk-%d.%s",
vmID, vmID,
@ -2166,29 +2157,23 @@ func resourceVirtualEnvironmentVMCreateCustomDisks(
fileFormat, fileFormat,
) )
//nolint:lll
commands = append( commands = append(
commands, commands,
`set -e`, `set -e`,
fmt.Sprintf(`datastore_id_image="%s"`, fileIDParts[0]), fmt.Sprintf(`file_id="%s"`, fileID),
fmt.Sprintf(`file_format="%s"`, fileFormat),
fmt.Sprintf(`datastore_id_target="%s"`, datastoreID), fmt.Sprintf(`datastore_id_target="%s"`, datastoreID),
fmt.Sprintf(`disk_index="%d"`, i),
fmt.Sprintf(`disk_options="%s"`, diskOptions), fmt.Sprintf(`disk_options="%s"`, diskOptions),
fmt.Sprintf(`disk_size="%d"`, size), fmt.Sprintf(`disk_size="%d"`, size),
fmt.Sprintf(`disk_interface="%s"`, diskInterface), fmt.Sprintf(`disk_interface="%s"`, diskInterface),
fmt.Sprintf(`file_path="%s"`, filePath),
fmt.Sprintf(`file_path_tmp="%s"`, filePathTmp), fmt.Sprintf(`file_path_tmp="%s"`, filePathTmp),
fmt.Sprintf(`vm_id="%d"`, vmID), fmt.Sprintf(`vm_id="%d"`, vmID),
`getdsi() { local nr='^([A-Za-z0-9_-]+): ([A-Za-z0-9_-]+)$'; local pr='^[[:space:]]+path[[:space:]]+([^[:space:]]+)$'; local dn=""; local dt=""; while IFS='' read -r l || [[ -n "$l" ]]; do if [[ "$l" =~ $nr ]]; then dt="${BASH_REMATCH[1]}"; dn="${BASH_REMATCH[2]}"; elif [[ "$l" =~ $pr ]] && [[ "$dn" == "$1" ]]; then echo "${BASH_REMATCH[1]};${dt}"; break; fi; done < /etc/pve/storage.cfg; }`, `source_image=$(pvesm path "$file_id")`,
`dsi_image="$(getdsi "$datastore_id_image")"`, `cp "$source_image" "$file_path_tmp"`,
`dsp_image="$(echo "$dsi_image" | cut -d ";" -f 1)"`, `qemu-img resize -f "$file_format" "$file_path_tmp" "${disk_size}G"`,
`dst_image="$(echo "$dsi_image" | cut -d ";" -f 2)"`, `imported_disk="$(qm importdisk "$vm_id" "$file_path_tmp" "$datastore_id_target" -format $file_format | grep "unused0" | cut -d ":" -f 3 | cut -d "'" -f 1)"`,
`if [[ -z "$dsp_image" ]]; then echo "Failed to determine the path for datastore '${datastore_id_image}' (${dsi_image})"; exit 1; fi`, `disk_id="${datastore_id_target}:$imported_disk${disk_options}"`,
`dsi_target="$(getdsi "$datastore_id_target")"`,
`dsp_target="$(echo "$dsi_target" | cut -d ";" -f 1)"`,
`cp "${dsp_image}${file_path}" "$file_path_tmp"`,
`qemu-img resize "$file_path_tmp" "${disk_size}G"`,
`imported_disk="$(qm importdisk "$vm_id" "$file_path_tmp" "$datastore_id_target" -format qcow2 | grep "unused0" | cut -d ":" -f 3 | cut -d "'" -f 1)"`,
`disk_id="${datastore_id_target}:$([[ -n "$dsp_target" ]] && echo "${vm_id}/" || echo "")$imported_disk$([[ -n "$dsp_target" ]] && echo ".qcow2" || echo "")${disk_options}"`,
`qm set "$vm_id" "-${disk_interface}" "$disk_id"`, `qm set "$vm_id" "-${disk_interface}" "$disk_id"`,
`rm -f "$file_path_tmp"`, `rm -f "$file_path_tmp"`,
) )