Merge pull request #2432 from dgageot/provision-logs

Add more logs to provisioner

libmachine/host/host.go

@@ -9,6 +9,7 @@ import (
 	"github.com/docker/machine/libmachine/auth"
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/engine"
+	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/mcnutils"
 	"github.com/docker/machine/libmachine/provision"
 	"github.com/docker/machine/libmachine/provision/pkgaction"
@@ -135,14 +136,13 @@ func (h *Host) Upgrade() error {
 		return err
 	}
 
+	log.Info("Upgrading docker...")
 	if err := provisioner.Package("docker", pkgaction.Upgrade); err != nil {
 		return err
 	}
 
-	if err := provisioner.Service("docker", serviceaction.Restart); err != nil {
+	log.Info("Restarting docker...")
-		return err
+	return provisioner.Service("docker", serviceaction.Restart)
-	}
-	return nil
 }
 
 func (h *Host) GetURL() (string, error) {

libmachine/libmachine.go

@@ -121,7 +121,7 @@ func (api *Client) Create(h *host.Host) error {
 			return fmt.Errorf("Error detecting OS: %s", err)
 		}
 
-		log.Info("Provisioning created instance...")
+		log.Infof("Provisioning with %s...", provisioner.String())
 		if err := provisioner.Provision(*h.HostOptions.SwarmOptions, *h.HostOptions.AuthOptions, *h.HostOptions.EngineOptions); err != nil {
 			return fmt.Errorf("Error running provisioning: %s", err)
 		}

libmachine/provision/arch.go

@@ -29,6 +29,10 @@ type ArchProvisioner struct {
 	SystemdProvisioner
 }
 
+func (provisioner *ArchProvisioner) String() string {
+	return "arch"
+}
+
 func (provisioner *ArchProvisioner) CompatibleWithHost() bool {
 	return provisioner.OsReleaseInfo.ID == provisioner.OsReleaseID || provisioner.OsReleaseInfo.IDLike == provisioner.OsReleaseID
 }

libmachine/provision/boot2docker.go

@@ -41,6 +41,10 @@ type Boot2DockerProvisioner struct {
 	SwarmOptions  swarm.Options
 }
 
+func (provisioner *Boot2DockerProvisioner) String() string {
+	return "boot2docker"
+}
+
 func (provisioner *Boot2DockerProvisioner) Service(name string, action serviceaction.ServiceAction) error {
 	_, err := provisioner.SSHCommand(fmt.Sprintf("sudo /etc/init.d/%s %s", name, action.String()))
 	return err

libmachine/provision/centos.go

@@ -19,3 +19,7 @@ func NewCentosProvisioner(d drivers.Driver) Provisioner {
 type CentosProvisioner struct {
 	*RedHatProvisioner
 }
+
+func (provisioner *CentosProvisioner) String() string {
+	return "centos"
+}

libmachine/provision/coreos.go

@@ -38,6 +38,10 @@ type CoreOSProvisioner struct {
 	SystemdProvisioner
 }
 
+func (provisioner *CoreOSProvisioner) String() string {
+	return "coreOS"
+}
+
 func (provisioner *CoreOSProvisioner) SetHostname(hostname string) error {
 	log.Debugf("SetHostname: %s", hostname)
 

libmachine/provision/debian.go

@@ -29,6 +29,10 @@ type DebianProvisioner struct {
 	SystemdProvisioner
 }
 
+func (provisioner *DebianProvisioner) String() string {
+	return "debian"
+}
+
 func (provisioner *DebianProvisioner) Package(name string, action pkgaction.PackageAction) error {
 	var packageAction string
 

libmachine/provision/fedora.go

@@ -19,3 +19,7 @@ func NewFedoraProvisioner(d drivers.Driver) Provisioner {
 type FedoraProvisioner struct {
 	*RedHatProvisioner
 }
+
+func (provisioner *FedoraProvisioner) String() string {
+	return "fedora"
+}

libmachine/provision/provisioner.go

@@ -21,6 +21,7 @@ type SSHCommander interface {
 
 // Provisioner defines distribution specific actions
 type Provisioner interface {
+	fmt.Stringer
 	SSHCommander
 
 	// Create the files for the daemon to consume configuration settings (return struct of content and path)

libmachine/provision/rancheros.go

@@ -52,6 +52,10 @@ type RancherProvisioner struct {
 	GenericProvisioner
 }
 
+func (provisioner *RancherProvisioner) String() string {
+	return "rancheros"
+}
+
 func (provisioner *RancherProvisioner) Service(name string, action serviceaction.ServiceAction) error {
 	command := fmt.Sprintf("sudo system-docker %s %s", action.String(), name)
 

libmachine/provision/redhat.go

@@ -61,6 +61,10 @@ type RedHatProvisioner struct {
 	SystemdProvisioner
 }
 
+func (provisioner *RedHatProvisioner) String() string {
+	return "redhat"
+}
+
 func (provisioner *RedHatProvisioner) SetHostname(hostname string) error {
 	// we have to have SetHostname here as well to use the RedHat provisioner
 	// SSHCommand to add the tty allocation

libmachine/provision/suse.go

@@ -76,6 +76,10 @@ type SUSEProvisioner struct {
 	GenericProvisioner
 }
 
+func (provisioner *SUSEProvisioner) String() string {
+	return "suse"
+}
+
 func (provisioner *SUSEProvisioner) Service(name string, action serviceaction.ServiceAction) error {
 	reloadDaemon := false
 	switch action {

libmachine/provision/systemd.go

@@ -13,6 +13,10 @@ type SystemdProvisioner struct {
 	GenericProvisioner
 }
 
+func (p *SystemdProvisioner) String() string {
+	return "redhat"
+}
+
 func NewSystemdProvisioner(osReleaseID string, d drivers.Driver) SystemdProvisioner {
 	return SystemdProvisioner{
 		GenericProvisioner{

libmachine/provision/ubuntu_systemd.go

@@ -30,6 +30,10 @@ type UbuntuSystemdProvisioner struct {
 	SystemdProvisioner
 }
 
+func (provisioner *UbuntuSystemdProvisioner) String() string {
+	return "ubuntu(systemd)"
+}
+
 func (provisioner *UbuntuSystemdProvisioner) CompatibleWithHost() bool {
 	const FirstUbuntuSystemdVersion = 15.04
 

libmachine/provision/ubuntu_upstart.go

@@ -39,6 +39,10 @@ type UbuntuProvisioner struct {
 	GenericProvisioner
 }
 
+func (provisioner *UbuntuProvisioner) String() string {
+	return "ubuntu(upstart)"
+}
+
 func (provisioner *UbuntuProvisioner) CompatibleWithHost() bool {
 	const FirstUbuntuSystemdVersion = 15.04
 	isUbuntu := provisioner.OsReleaseInfo.ID == provisioner.OsReleaseID
@@ -151,6 +155,7 @@ func (provisioner *UbuntuProvisioner) Provision(swarmOptions swarm.Options, auth
 		}
 	}
 
+	log.Info("Installing Docker...")
 	if err := installDockerGeneric(provisioner, engineOptions.InstallURL); err != nil {
 		return err
 	}