Start machine if needed for upgrade

nathanleclaire · nathanleclaire · commit e55dfb261812 · 2017-02-22T13:54:36.000-08:00
Signed-off-by: Nathan LeClaire &lt;nathan.leclaire@gmail.com&gt;
diff --git a/libmachine/host/host.go b/libmachine/host/host.go
@@ -1,7 +1,6 @@
 package host
 
 import (
-	"errors"
 	"regexp"
 
 	"github.com/docker/machine/libmachine/auth"
@@ -19,9 +18,8 @@ import (
 )
 
 var (
-	validHostNamePattern                               = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9\-\.]*$`)
-	errMachineMustBeRunningForUpgrade                  = errors.New("machine must be running to upgrade")
-	stdSSHClientCreator               SSHClientCreator = &StandardSSHClientCreator{}
+	validHostNamePattern                  = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9\-\.]*$`)
+	stdSSHClientCreator  SSHClientCreator = &StandardSSHClientCreator{}
 )
 
 type SSHClientCreator interface {
@@ -171,7 +169,10 @@ func (h *Host) Upgrade() error {
 	}
 
 	if machineState != state.Running {
-		return errMachineMustBeRunningForUpgrade
+		log.Info("Starting machine so machine can be upgraded...")
+		if err := h.Start(); err != nil {
+			return err
+		}
 	}
 
 	provisioner, err := provision.DetectProvisioner(h.Driver)

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package host`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "errors"`
`5`	`4`	`"regexp"`
`6`	`5`
`7`	`6`	`"github.com/docker/machine/libmachine/auth"`
`@@ -19,9 +18,8 @@ import (`
`19`	`18`	`)`
`20`	`19`
`21`	`20`	`var (`
`22`		- validHostNamePattern = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9\-\.]*$`)
`23`		`- errMachineMustBeRunningForUpgrade = errors.New("machine must be running to upgrade")`
`24`		`- stdSSHClientCreator SSHClientCreator = &StandardSSHClientCreator{}`
	`21`	+ validHostNamePattern = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9\-\.]*$`)
	`22`	`+ stdSSHClientCreator SSHClientCreator = &StandardSSHClientCreator{}`
`25`	`23`	`)`
`26`	`24`
`27`	`25`	`type SSHClientCreator interface {`
`@@ -171,7 +169,10 @@ func (h *Host) Upgrade() error {`
`171`	`169`	`}`
`172`	`170`
`173`	`171`	`if machineState != state.Running {`
`174`		`- return errMachineMustBeRunningForUpgrade`
	`172`	`+ log.Info("Starting machine so machine can be upgraded...")`
	`173`	`+ if err := h.Start(); err != nil {`
	`174`	`+ return err`
	`175`	`+ }`
`175`	`176`	`}`
`176`	`177`
`177`	`178`	`provisioner, err := provision.DetectProvisioner(h.Driver)`