diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-13 14:34:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 14:34:29 -0400 |
| commit | f07a2bfbec03bc9c86414e697ac797ce04807da1 (patch) | |
| tree | 708b80eafb589802c2261aea1c603bdabc24e8f8 /pkg/machine | |
| parent | 8fa3e6c58e4afffea7abf7e1f179e08b19db46a9 (diff) | |
| parent | 7a667c4ac301c374eaf058b1924c4dbf6a9bbd7a (diff) | |
| download | podman-f07a2bfbec03bc9c86414e697ac797ce04807da1.tar.gz podman-f07a2bfbec03bc9c86414e697ac797ce04807da1.tar.bz2 podman-f07a2bfbec03bc9c86414e697ac797ce04807da1.zip | |
Merge pull request #11440 from ashley-cui/ssh
Use default username for podman machine ssh
Diffstat (limited to 'pkg/machine')
| -rw-r--r-- | pkg/machine/config.go | 3 | ||||
| -rw-r--r-- | pkg/machine/qemu/machine.go | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkg/machine/config.go b/pkg/machine/config.go index cad71ba49..8db2335aa 100644 --- a/pkg/machine/config.go +++ b/pkg/machine/config.go @@ -61,7 +61,8 @@ type ListResponse struct { } type SSHOptions struct { - Args []string + Username string + Args []string } type StartOptions struct{} diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 855a39c56..5d8c6e6ce 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -488,7 +488,12 @@ func (v *MachineVM) SSH(name string, opts machine.SSHOptions) error { return errors.Errorf("vm %q is not running.", v.Name) } - sshDestination := v.RemoteUsername + "@localhost" + username := opts.Username + if username == "" { + username = v.RemoteUsername + } + + sshDestination := username + "@localhost" port := strconv.Itoa(v.Port) args := []string{"-i", v.IdentityPath, "-p", port, sshDestination, "-o", "UserKnownHostsFile /dev/null", "-o", "StrictHostKeyChecking no"} |