Skip to content

Commit 428468f

Browse files
improve vm id resolution in scripts
1 parent a7cb283 commit 428468f

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

proxmox-lxc/main.tf

+10-10
Original file line numberDiff line numberDiff line change
@@ -512,10 +512,10 @@ resource "proxmox_lxc" "lxc" {
512512
private_key = file(var.proxmox_ssh_key_path)
513513
}
514514
inline = [
515-
"pct status $(pct list | grep \"\\b${local.vm_name}\\b\" | awk '{print $1}') | grep -v running && pct start $(pct list | grep \"\\b${local.vm_name}\\b\" | awk '{print $1}') || /bin/true",
516-
"lxc-wait $(pct list | grep \"\\b${local.vm_name}\\b\" | awk '{print $1}') -s RUNNING",
517-
"pct push $(pct list | grep \"\\b${local.vm_name}\\b\" | awk '{print $1}') /tmp/proxmox_lxc_${local.vm_name}_bootstrap.sh /bootstrap.sh",
518-
"pct exec $(pct list | grep \"\\b${local.vm_name}\\b\" | awk '{print $1}') /bin/bash /bootstrap.sh"
515+
"pct status $(pct list | awk '{ print $1\"@\"$3 }' | grep \"@${local.vm_name}$\" | awk -F@ '{print $1}') | grep -v running && pct start $(pct list | awk '{ print $1\"@\"$3 }' | grep \"@${local.vm_name}$\" | awk -F@ '{print $1}') || /bin/true",
516+
"lxc-wait $(pct list | awk '{ print $1\"@\"$3 }' | grep \"@${local.vm_name}$\" | awk -F@ '{print $1}') -s RUNNING",
517+
"pct push $(pct list | awk '{ print $1\"@\"$3 }' | grep \"@${local.vm_name}$\" | awk -F@ '{print $1}') /tmp/proxmox_lxc_${local.vm_name}_bootstrap.sh /bootstrap.sh",
518+
"pct exec $(pct list | awk '{ print $1\"@\"$3 }' | grep \"@${local.vm_name}$\" | awk -F@ '{print $1}') /bin/bash /bootstrap.sh"
519519
]
520520
}
521521
}
@@ -537,10 +537,10 @@ resource "null_resource" "start_vm" {
537537
private_key = file(var.proxmox_ssh_key_path)
538538
}
539539
inline = [
540-
"pct status $(pct list | grep \"\\b${local.vm_name}\\b\" | awk '{print $1}') | grep -v running && pct start $(pct list | grep \"\\b${local.vm_name}\\b\" | awk '{print $1}') || /bin/true",
541-
"lxc-wait $(pct list | grep \"\\b${local.vm_name}\\b\" | awk '{print $1}') -s RUNNING",
542-
"pct push $(pct list | grep \"\\b${local.vm_name}\\b\" | awk '{print $1}') /tmp/proxmox_lxc_${local.vm_name}_bootstrap.sh /bootstrap.sh",
543-
"pct exec $(pct list | grep \"\\b${local.vm_name}\\b\" | awk '{print $1}') /bin/bash /bootstrap.sh"
540+
"pct status $(pct list | awk '{ print $1\"@\"$3 }' | grep \"@${local.vm_name}$\" | awk -F@ '{print $1}') | grep -v running && pct start $(pct list | awk '{ print $1\"@\"$3 }' | grep \"@${local.vm_name}$\" | awk -F@ '{print $1}') || /bin/true",
541+
"lxc-wait $(pct list | awk '{ print $1\"@\"$3 }' | grep \"@${local.vm_name}$\" | awk -F@ '{print $1}') -s RUNNING",
542+
"pct push $(pct list | awk '{ print $1\"@\"$3 }' | grep \"@${local.vm_name}$\" | awk -F@ '{print $1}') /tmp/proxmox_lxc_${local.vm_name}_bootstrap.sh /bootstrap.sh",
543+
"pct exec $(pct list | awk '{ print $1\"@\"$3 }' | grep \"@${local.vm_name}$\" | awk -F@ '{print $1}') /bin/bash /bootstrap.sh"
544544
]
545545
}
546546
}
@@ -562,8 +562,8 @@ resource "null_resource" "stop_vm" {
562562
private_key = file(var.proxmox_ssh_key_path)
563563
}
564564
inline = [
565-
"pct stop $(pct list | grep \"\\b${local.vm_name}\\b\" | awk '{print $1}')",
566-
"lxc-wait $(pct list | grep \"\\b${local.vm_name}\\b\" | awk '{print $1}') -s STOPPED"
565+
"pct stop $(pct list | awk '{ print $1\"@\"$3 }' | grep \"@${local.vm_name}$\" | awk -F@ '{print $1}')",
566+
"lxc-wait $(pct list | awk '{ print $1\"@\"$3 }' | grep \"@${local.vm_name}$\" | awk -F@ '{print $1}') -s STOPPED"
567567
]
568568
}
569569
}

0 commit comments

Comments
 (0)