public/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-proxmox.git synced 2024-09-28 22:16:03 +00:00
Code Issues Projects Releases Wiki Activity

restore ssh port option for ssh_forward

Browse Source
This commit is contained in:
Grant Gongaware 2019-09-04 12:45:02 -07:00
parent baf8df69f7
commit 23e407d44c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
proxmox/resource_vm_qemu.go
View File

@ -290,8 +290,8 @@ func resourceVmQemu() *schema.Resource {
}, },
}, },
"serial": &schema.Schema{ "serial": &schema.Schema{
Type: schema.TypeSet, Type: schema.TypeSet,
Optional: true, Optional: true,
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"id": &schema.Schema{ "id": &schema.Schema{
@ -782,9 +782,9 @@ func diskSizeGB(dcSize interface{}) float64 {
diskString := strings.ToUpper(dcSize.(string)) diskString := strings.ToUpper(dcSize.(string))
re := regexp.MustCompile("([0-9]+)([A-Z]*)") re := regexp.MustCompile("([0-9]+)([A-Z]*)")
diskArray := re.FindStringSubmatch(diskString) diskArray := re.FindStringSubmatch(diskString)
diskSize, _ = strconv.ParseFloat(diskArray[1], 64) diskSize, _ = strconv.ParseFloat(diskArray[1], 64)
if len(diskArray) >= 3 { if len(diskArray) >= 3 {
switch diskArray[2] { switch diskArray[2] {
case "G", "GB": case "G", "GB":
@ -903,6 +903,12 @@ func initConnInfo(
ipMatch := rxIPconfig.FindStringSubmatch(d.Get("ipconfig0").(string)) ipMatch := rxIPconfig.FindStringSubmatch(d.Get("ipconfig0").(string))
sshHost = ipMatch[1] sshHost = ipMatch[1]
} }
// Check if we got a speficied port
if strings.Contains(sshHost, ":") {
sshParts := strings.Split(sshHost, ":")
sshHost = sshParts[0]
sshPort = sshParts[1]
}
} else { } else {
log.Print("[DEBUG] setting up SSH forward") log.Print("[DEBUG] setting up SSH forward")
sshPort, err = pxapi.SshForwardUsernet(vmr, client) sshPort, err = pxapi.SshForwardUsernet(vmr, client)