Skip to content

Outscale Builder: Get SSH Host from VM.Nics insead VM's Root #8077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
azr merged 3 commits into from
Sep 5, 2019
Merged

Outscale Builder: Get SSH Host from VM.Nics insead VM's Root #8077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d024b9
change ui message to private ip in run source vm
marinsalinas Sep 5, 2019
793b3f1
chore: remove unused code in omi config
marinsalinas Sep 5, 2019
640612d
refactor: get ssh hot from nics instead of root of the vm
marinsalinas Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions builder/osc/common/omi_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@ type OMIConfig struct {
SnapshotGroups []string `mapstructure:"snapshot_groups"`
}

func stringInSlice(s []string, searchstr string) bool {
for _, item := range s {
if item == searchstr {
return true
}
}
return false
}

func (c *OMIConfig) Prepare(accessConfig *AccessConfig, ctx *interpolate.Context) []error {
var errs []error

Expand Down
57 changes: 41 additions & 16 deletions builder/osc/common/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package common
import (
"errors"
"fmt"
"sort"
"time"

"github.com/hashicorp/packer/helper/multistep"
Expand All @@ -27,35 +28,42 @@ func SSHHost(e oapiDescriber, sshInterface string) func(multistep.StateBag) (str
for j := 0; j <= tries; j++ {
var host string
i := state.Get("vm").(oapi.Vm)

if len(i.Nics) <= 0 {
return "", errors.New("couldn't determine address for vm, nics are empty")
}

nic := i.Nics[0]

if sshInterface != "" {
switch sshInterface {
case "public_ip":
if i.PublicIp != "" {
host = i.PublicIp
}
case "private_ip":
if i.PrivateIp != "" {
host = i.PrivateIp
if nic.LinkPublicIp.PublicIp != "" {
host = nic.LinkPublicIp.PublicIp
}
case "public_dns":
if i.PublicDnsName != "" {
host = i.PublicDnsName
if nic.LinkPublicIp.PublicDnsName != "" {
host = nic.LinkPublicIp.PublicDnsName
}
case "private_ip":
if privateIP, err := getPrivateIP(nic); err != nil {
host = privateIP.PrivateIp
}
case "private_dns":
if i.PrivateDnsName != "" {
host = i.PrivateDnsName
if privateIP, err := getPrivateIP(nic); err != nil {
host = privateIP.PrivateDnsName
}
default:
panic(fmt.Sprintf("Unknown interface type: %s", sshInterface))
}
} else if i.NetId != "" {
if i.PublicIp != "" {
host = i.PublicIp
} else if i.PrivateIp != "" {
host = i.PrivateIp
if nic.LinkPublicIp.PublicIp != "" {
host = nic.LinkPublicIp.PublicIp
} else if privateIP, err := getPrivateIP(nic); err != nil {
host = privateIP.PrivateIp
}
} else if i.PublicDnsName != "" {
host = i.PublicDnsName
} else if nic.LinkPublicIp.PublicDnsName != "" {
host = nic.LinkPublicIp.PublicDnsName
}

if host != "" {
Expand All @@ -82,3 +90,20 @@ func SSHHost(e oapiDescriber, sshInterface string) func(multistep.StateBag) (str
return "", errors.New("couldn't determine address for vm")
}
}

func getPrivateIP(nic oapi.NicLight) (oapi.PrivateIpLightForVm, error) {
isPrimary := true

i := sort.Search(len(nic.PrivateIps), func(i int) bool { return nic.PrivateIps[i].IsPrimary == isPrimary })

if i < len(nic.PrivateIps) && nic.PrivateIps[i].IsPrimary == isPrimary {
return nic.PrivateIps[i], nil
}

if len(nic.PrivateIps) > 0 {
return nic.PrivateIps[0], nil
}

return oapi.PrivateIpLightForVm{}, fmt.Errorf("couldn't determine private address for vm")

}
2 changes: 1 addition & 1 deletion builder/osc/common/step_run_source_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul
}

if vm.PrivateIp != "" {
ui.Message(fmt.Sprintf("Private IP: %s", vm.PublicIp))
ui.Message(fmt.Sprintf("Private IP: %s", vm.PrivateIp))
}
}

Expand Down