merge nathanleclaire/ehazlett-redhat-provisioning

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

docs/index.md

@@ -1110,6 +1110,7 @@ Options:
 
 The DigitalOcean driver will use `ubuntu-14-04-x64` as the default image.
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 Environment variables and default values:
 
@@ -1137,7 +1138,6 @@ Options:
  - `--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.
->>>>>>> 18cfe58... redhat: updated docs to explain base operating systems
 
 #### Generic
 Create machines using an existing VM/Host with SSH.
@@ -1530,6 +1530,7 @@ Options:
 
 The VMware vSphere driver uses the latest boot2docker image.
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 Environment variables and default values:
 
@@ -1581,6 +1582,8 @@ 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

libmachine/provision/centos.go

@@ -27,8 +27,8 @@ func NewCentosProvisioner(d drivers.Driver) Provisioner {
 	}
 	p := &CentosProvisioner{
 		RedHatProvisioner{
-			g,
-			dockerCentosRPMPath,
+			GenericProvisioner: g,
+			DockerRPMPath:      dockerCentosRPMPath,
 		},
 	}
 	return p

libmachine/provision/fedora.go

@@ -27,8 +27,8 @@ func NewFedoraProvisioner(d drivers.Driver) Provisioner {
 	}
 	p := &FedoraProvisioner{
 		RedHatProvisioner{
-			g,
-			dockerFedoraRPMPath,
+			GenericProvisioner: g,
+			DockerRPMPath:      dockerFedoraRPMPath,
 		},
 	}
 	return p

libmachine/provision/redhat.go

@@ -29,7 +29,7 @@ func init() {
 
 func NewRedHatProvisioner(d drivers.Driver) Provisioner {
 	return &RedHatProvisioner{
-		GenericProvisioner{
+		GenericProvisioner: GenericProvisioner{
 			DockerOptionsDir:  "/etc/docker",
 			DaemonOptionsFile: "/etc/systemd/system/docker.service",
 			OsReleaseId:       "rhel",
@@ -38,7 +38,7 @@ func NewRedHatProvisioner(d drivers.Driver) Provisioner {
 			},
 			Driver: d,
 		},
-		dockerRHELRPMPath,
+		DockerRPMPath: dockerRHELRPMPath,
 	}
 }
 

ssh/client.go

@@ -47,6 +47,7 @@ const (
 
 var (
 	baseSSHArgs = []string{
+		"-o", "PasswordAuthentication=no",
 		"-o", "IdentitiesOnly=yes",
 		"-o", "StrictHostKeyChecking=no",
 		"-o", "UserKnownHostsFile=/dev/null",