Remove the connection checker, use SSH instead

Also update "config", to output ssh parameters

Author: afbjorklund

commands/config.go

@@ -3,11 +3,8 @@ package commands
 import (
 	"fmt"
 	"os"
-	"path/filepath"
 
-	"github.com/boot2podman/machine/commands/mcndirs"
 	"github.com/boot2podman/machine/libmachine"
-	"github.com/boot2podman/machine/libmachine/check"
 	"github.com/boot2podman/machine/libmachine/log"
 )
 
@@ -26,21 +23,31 @@ func cmdConfig(c CommandLine, api libmachine.API) error {
 		return err
 	}
 
-	podmanHost, _, err := check.DefaultConnChecker.Check(host)
+	if host.Driver == nil {
+		return err
+	}
+
+	user := host.Driver.GetSSHUsername()
+
+	addr, err := host.Driver.GetSSHHostname()
+	if err != nil {
+		return err
+	}
+
+	port, err := host.Driver.GetSSHPort()
 	if err != nil {
-		return fmt.Errorf("Error running connection boilerplate: %s", err)
+		return err
 	}
 
-	log.Debug(podmanHost)
+	key := host.Driver.GetSSHKeyPath()
 
-	tlsCACert := filepath.Join(mcndirs.GetMachineDir(), host.Name, "ca.pem")
-	tlsCert := filepath.Join(mcndirs.GetMachineDir(), host.Name, "cert.pem")
-	tlsKey := filepath.Join(mcndirs.GetMachineDir(), host.Name, "key.pem")
+	if addr != "" {
+		// always use root@ for socket
+		user = "root"
+	}
 
-	// TODO(nathanleclaire): These magic strings for the certificate file
-	// names should be cross-package constants.
-	fmt.Printf("--tlsverify\n--tlscacert=%q\n--tlscert=%q\n--tlskey=%q\n-H=%s\n",
-		tlsCACert, tlsCert, tlsKey, podmanHost)
+	fmt.Printf("--username=%s\n--host=%s\n--port=%d\n--identity-file=%s\n",
+		user, addr, port, key)
 
 	return nil
 }

libmachine/check/check.go

@@ -9,7 +9,6 @@ import (
 	"github.com/boot2podman/machine/drivers/errdriver"
 	"github.com/boot2podman/machine/libmachine/auth"
 	"github.com/boot2podman/machine/libmachine/cert"
-	"github.com/boot2podman/machine/libmachine/check"
 	"github.com/boot2podman/machine/libmachine/drivers"
 	"github.com/boot2podman/machine/libmachine/drivers/plugin/localbinary"
 	"github.com/boot2podman/machine/libmachine/drivers/rpc"
@@ -169,9 +168,15 @@ func (api *Client) performCreate(h *host.Host) error {
 
 	// We should check the connection to podman here
 	log.Info("Checking connection to Podman...")
-	if _, _, err = check.DefaultConnChecker.Check(h); err != nil {
-		return fmt.Errorf("Error checking the host: %s", err)
+	client, err := h.CreateSSHClient()
+	if err != nil {
+		return fmt.Errorf("Error creating SSH client: %s", err)
+	}
+	version, err := client.Output("podman --version")
+	if err != nil {
+		return fmt.Errorf("Error getting podman version: %s", err)
 	}
+	log.Debugf("%s", version)
 
 	log.Info("Podman is up and running!")
 	return nil