RedHat provisioning

docs/index.md

@@ -1110,6 +1110,8 @@ Options:
 
 The DigitalOcean driver will use `ubuntu-14-04-x64` as the default image.
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 Environment variables and default values:
 
 | CLI option                          | Environment variable              | Default  |
@@ -1121,6 +1123,21 @@ Environment variables and default values:
 | `--digitalocean-ipv6`               | `DIGITALOCEAN_IPV6`               | `false`  |
 | `--digitalocean-private-networking` | `DIGITALOCEAN_PRIVATE_NETWORKING` | `false`  |
 | `--digitalocean-backups`            | `DIGITALOCEAN_BACKUPS`            | `false`  |
+=======
+#### exoscale
+Create machines on [exoscale](https://www.exoscale.ch/).
+
+Get your API key and API secret key from [API details](https://portal.exoscale.ch/account/api) and pass them to `machine create` with the `--exoscale-api-key` and `--exoscale-api-secret-key` options.
+
+Options:
+
+ - `--exoscale-api-key`: Your API key.
+ - `--exoscale-api-secret-key`: Your API secret key.
+ - `--exoscale-instance-profile`: Instance profile. Default: `small`.
+ - `--exoscale-disk-size`: Disk size for the host in GB. Default: `50`.
+ - `--exoscale-security-group`: Security group. It will be created if it doesn't exist. Default: `docker-machine`.
+
+If a custom security group is provided, you need to ensure that you allow TCP port 2376 in an ingress rule.
 
 #### Generic
 Create machines using an existing VM/Host with SSH.
@@ -1513,6 +1530,8 @@ Options:
 
 The VMware vSphere driver uses the latest boot2docker image.
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 Environment variables and default values:
 
 | CLI option                        | Environment variable      | Default                  |
@@ -1563,6 +1582,16 @@ Environment variables and default values:
 | `--exoscale-availability-zone`  | `EXOSCALE_AVAILABILITY_ZONE` | `ch-gva-2`       |
 | `--exoscale-keypair`            | `EXOSCALE_KEYPAIR`           | -                |
 
+=======
+
+## Base Operating Systems
+The default base operating system for Machine is Boot2Docker on local providers
+(VirtualBox, Fusion, Hyper-V, etc) and the latest Ubuntu LTS supported
+by the cloud provider.  RedHat Enterprise Linux is also supported.  To use
+RHEL, you will need to select the image accordingly with the provider.  For
+example, in Amazon EC2, you could use a RedHat 7.1 AMI ("ami-12663b7a") as the
+`--amazonec2-ami` option which create an instance using RHEL 7.1 64-bit.
+
 ## Release Notes
 
 ### Version 0.2.0 (April 16, 2015)

libmachine/provision/centos.go

@@ -0,0 +1,39 @@
+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
+	dockerCentosRPMPath = "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() {
+	Register("Centos", &RegisteredProvisioner{
+		New: NewCentosProvisioner,
+	})
+}
+
+func NewCentosProvisioner(d drivers.Driver) Provisioner {
+	g := GenericProvisioner{
+		DockerOptionsDir:  "/etc/docker",
+		DaemonOptionsFile: "/etc/systemd/system/docker.service",
+		OsReleaseId:       "centos",
+		Packages:          []string{},
+		Driver:            d,
+	}
+	p := &CentosProvisioner{
+		RedHatProvisioner{
+			GenericProvisioner: g,
+			DockerRPMPath:      dockerCentosRPMPath,
+		},
+	}
+	return p
+}
+
+type CentosProvisioner struct {
+	RedHatProvisioner
+}

libmachine/provision/engine_config_context.go

@@ -6,7 +6,8 @@ import (
 )
 
 type EngineConfigContext struct {
-	DockerPort    int
-	AuthOptions   auth.AuthOptions
-	EngineOptions engine.EngineOptions
+	DockerPort       int
+	AuthOptions      auth.AuthOptions
+	EngineOptions    engine.EngineOptions
+	DockerOptionsDir string
 }

libmachine/provision/fedora.go

@@ -0,0 +1,39 @@
+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: "/etc/systemd/system/docker.service",
+		OsReleaseId:       "fedora",
+		Packages:          []string{},
+		Driver:            d,
+	}
+	p := &FedoraProvisioner{
+		RedHatProvisioner{
+			GenericProvisioner: g,
+			DockerRPMPath:      dockerFedoraRPMPath,
+		},
+	}
+	return p
+}
+
+type FedoraProvisioner struct {
+	RedHatProvisioner
+}

libmachine/provision/pkgaction/action.go

@@ -6,12 +6,18 @@ const (
 	Restart ServiceAction = iota
 	Start
 	Stop
+	Enable
+	Disable
+	DaemonReload
 )
 
 var serviceActions = []string{
 	"restart",
 	"start",
 	"stop",
+	"enable",
+	"disable",
+	"daemon-reload",
 }
 
 func (s ServiceAction) String() string {

libmachine/provision/provisioner.go

@@ -8,6 +8,7 @@ import (
 	"github.com/docker/machine/libmachine/engine"
 	"github.com/docker/machine/libmachine/provision/pkgaction"
 	"github.com/docker/machine/libmachine/swarm"
+	"github.com/docker/machine/log"
 )
 
 var provisioners = make(map[string]*RegisteredProvisioner)
@@ -82,6 +83,7 @@ func DetectProvisioner(d drivers.Driver) (Provisioner, error) {
 		provisioner.SetOsReleaseInfo(osReleaseInfo)
 
 		if provisioner.CompatibleWithHost() {
+			log.Debugf("Compatible OS: %s", osReleaseInfo.Id)
 			return provisioner, nil
 		}
 	}