fedora: provisioner based off of redhat

ehazlett · ehazlett · commit f17556b2fae4 · 2015-05-21T13:44:40.000-04:00
Signed-off-by: Evan Hazlett &lt;ejhazlett@gmail.com&gt;
diff --git a/libmachine/provision/fedora.go b/libmachine/provision/fedora.go
@@ -0,0 +1,42 @@
+package provision
+
+import (
+	"github.com/docker/machine/drivers"
+)
+
+const (
+	// TODO: eventually the RPM install process will be integrated
+	// into the get.docker.com install script; for now
+	// we install via vendored RPMs
+	dockerFedoraRPMPath = "https://docker-mcn.s3.amazonaws.com/public/fedora/rpms/docker-engine-1.6.1-0.0.20150511.171646.git1b47f9f.fc21.x86_64.rpm"
+)
+
+func init() {
+	Register("Fedora", &RegisteredProvisioner{
+		New: NewFedoraProvisioner,
+	})
+}
+
+func NewFedoraProvisioner(d drivers.Driver) Provisioner {
+	g := GenericProvisioner{
+		DockerOptionsDir:  "/etc/docker",
+		DaemonOptionsFile: "/lib/systemd/system/docker.service",
+		OsReleaseId:       "fedora",
+		Packages: []string{
+			"curl",
+			"yum-utils",
+		},
+		Driver: d,
+	}
+	p := &FedoraProvisioner{
+		RedHatProvisioner{
+			g,
+			dockerFedoraRPMPath,
+		},
+	}
+	return p
+}
+
+type FedoraProvisioner struct {
+	RedHatProvisioner
+}
diff --git a/libmachine/provision/redhat.go b/libmachine/provision/redhat.go
@@ -18,7 +18,7 @@ const (
 	// TODO: eventually the RPM install process will be integrated
 	// into the get.docker.com install script; for now
 	// we install via vendored RPMs
-	dockerRPMPath = "https://docker-mcn.s3.amazonaws.com/public/redhat/rpms/docker-engine-1.6.1-0.0.20150511.171646.git1b47f9f.el7.centos.x86_64.rpm"
+	dockerRHELRPMPath = "https://docker-mcn.s3.amazonaws.com/public/redhat/rpms/docker-engine-1.6.1-0.0.20150511.171646.git1b47f9f.el7.centos.x86_64.rpm"
 )
 
 func init() {
@@ -38,11 +38,13 @@ func NewRedHatProvisioner(d drivers.Driver) Provisioner {
 			},
 			Driver: d,
 		},
+		dockerRHELRPMPath,
 	}
 }
 
 type RedHatProvisioner struct {
 	GenericProvisioner
+	DockerRPMPath string
 }
 
 func (provisioner *RedHatProvisioner) Service(name string, action pkgaction.ServiceAction) error {
@@ -110,7 +112,7 @@ func installDocker(provisioner *RedHatProvisioner) error {
 func (provisioner *RedHatProvisioner) installOfficialDocker() error {
 	log.Debug("installing docker")
 
-	if _, err := provisioner.SSHCommand(fmt.Sprintf("sudo yum install -y --nogpgcheck  %s", dockerRPMPath)); err != nil {
+	if _, err := provisioner.SSHCommand(fmt.Sprintf("sudo yum install -y --nogpgcheck  %s", provisioner.DockerRPMPath)); err != nil {
 		return err
 	}
 
@@ -142,6 +144,7 @@ func (provisioner *RedHatProvisioner) Provision(swarmOptions swarm.SwarmOptions,
 	}
 
 	for _, pkg := range provisioner.Packages {
+		log.Debugf("installing base package: name=%s", pkg)
 		if err := provisioner.Package(pkg, pkgaction.Install); err != nil {
 			return err
 		}

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ const (`
`18`	`18`	`// TODO: eventually the RPM install process will be integrated`
`19`	`19`	`// into the get.docker.com install script; for now`
`20`	`20`	`// we install via vendored RPMs`
`21`		`- dockerRPMPath = "https://docker-mcn.s3.amazonaws.com/public/redhat/rpms/docker-engine-1.6.1-0.0.20150511.171646.git1b47f9f.el7.centos.x86_64.rpm"`
	`21`	`+ dockerRHELRPMPath = "https://docker-mcn.s3.amazonaws.com/public/redhat/rpms/docker-engine-1.6.1-0.0.20150511.171646.git1b47f9f.el7.centos.x86_64.rpm"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func init() {`
`@@ -38,11 +38,13 @@ func NewRedHatProvisioner(d drivers.Driver) Provisioner {`
`38`	`38`	`},`
`39`	`39`	`Driver: d,`
`40`	`40`	`},`
	`41`	`+ dockerRHELRPMPath,`
`41`	`42`	`}`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`type RedHatProvisioner struct {`
`45`	`46`	`GenericProvisioner`
	`47`	`+ DockerRPMPath string`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`func (provisioner *RedHatProvisioner) Service(name string, action pkgaction.ServiceAction) error {`
`@@ -110,7 +112,7 @@ func installDocker(provisioner *RedHatProvisioner) error {`
`110`	`112`	`func (provisioner *RedHatProvisioner) installOfficialDocker() error {`
`111`	`113`	`log.Debug("installing docker")`
`112`	`114`
`113`		`- if _, err := provisioner.SSHCommand(fmt.Sprintf("sudo yum install -y --nogpgcheck %s", dockerRPMPath)); err != nil {`
	`115`	`+ if _, err := provisioner.SSHCommand(fmt.Sprintf("sudo yum install -y --nogpgcheck %s", provisioner.DockerRPMPath)); err != nil {`
`114`	`116`	`return err`
`115`	`117`	`}`
`116`	`118`
`@@ -142,6 +144,7 @@ func (provisioner *RedHatProvisioner) Provision(swarmOptions swarm.SwarmOptions,`
`142`	`144`	`}`
`143`	`145`
`144`	`146`	`for _, pkg := range provisioner.Packages {`
	`147`	`+ log.Debugf("installing base package: name=%s", pkg)`
`145`	`148`	`if err := provisioner.Package(pkg, pkgaction.Install); err != nil {`
`146`	`149`	`return err`
`147`	`150`	`}`