Use default username for podman machine ssh

When using the defaut conection for podman machine ssh, use the default
username too.

Signed-off-by: Ashley Cui <acui@redhat.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/pkg/machine/config.go b/pkg/machine/config.go
index db9bfa7de..620955a7b 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 38a16c3ef..3a6fecff4 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -485,7 +485,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"}