Merge abd8ef6 into 64d4c7e

.docs/user-guide/isilon.md

@@ -0,0 +1,61 @@
+#Isilon
+
+Scale-Out NAS is my fame.
+
+---
+
+## Overview
+The Isilon driver registers a storage driver named `isilon` with the `REX-Ray`
+driver manager and is used to connect and manage Isilon NAS storage.
+
+## Configuration
+The following is an example configuration of the Isilon driver.
+
+```yaml
+isilon:
+  endpoint: https://endpoint:8080
+  insecure: true
+  username: username
+  password: password
+  volumePath: /rexray
+  nfsHost: nfsHost
+```
+
+For information on the equivalent environment variable and CLI flag names
+please see the section on how non top-level configuration properties are
+[transformed](./config/#all-other-properties).
+
+## Extra Paramters
+The following items are configurable specific to this driver.
+
+ - `volumePath` represents the location under `/ifs/volumes` to allow volumes to be created and removed.
+ - `nfsHost` is the configurable host used when mounting exports
+
+## Activating the Driver
+To activate the XtremIO driver please follow the instructions for
+[activating storage drivers](/user-guide/config#activating-storage-drivers),
+using `isilon` as the driver name.
+
+## Examples
+Below is a full `rexray.yml` file that works with Isilon.
+
+```yaml
+rexray:
+  storageDrivers:
+  - isilon
+isilon:
+  endpoint: https://endpoint:8080
+  insecure: true
+  username: username
+  password: password
+  volumePath: /rexray
+  nfsHost: nfsHost
+```
+
+## Instructions
+It is expected that the `volumePath` exists already within the Isilon system.  This would reflect a directory create under `/ifs/volumes/rexray`.  It is not necessary to export this volume.
+
+## Caveats
+
+- This driver currently ignores the `--size` and `--volumeType` flags.
+- This driver does not support pre-emption currently.  Requests from alternate hosts can have bad results.

README.md

@@ -10,6 +10,7 @@ It is available as a standalone process today and in the future (0.3) as a distr
 Irrespective of platform, `REX-Ray` provides common functionality for the following.
 - AWS EC2 (EBS)
 - OpenStack (Cinder)
+- EMC Isilon
 - EMC ScaleIO
 - EMC XtremIO
 - Google Compute Engine (GCE)

core/drivers_os.go

@@ -2,6 +2,7 @@ package core
 
 import (
 	"bytes"
+	"strings"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/docker/pkg/mount"
@@ -131,6 +132,10 @@ func (r *odm) Mount(
 	return errors.ErrNoOSDetected
 }
 
+func (r *odm) isNfsDevice(device string) bool {
+	return strings.Contains(device, ":")
+}
+
 func (r *odm) Format(
 	deviceName, fsType string, overwriteFs bool) error {
 	for _, d := range r.drivers {
@@ -140,6 +145,10 @@ func (r *odm) Format(
 			"overwriteFs": overwriteFs,
 			"driverName":  d.Name()}).Info(
 			"formatting if blank or overwriteFs specified")
+		if r.isNfsDevice(deviceName) {
+			return nil
+		}
+
 		return d.Format(deviceName, fsType, overwriteFs)
 	}
 	return errors.ErrNoOSDetected

drivers/os/linux/linux.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/exec"
 	"runtime"
+	"strings"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/akutz/goof"
@@ -75,9 +76,30 @@ func (d *driver) Unmount(mountPoint string) error {
 	return mount.Unmount(mountPoint)
 }
 
+func (d *driver) isNfsDevice(device string) bool {
+	return strings.Contains(device, ":")
+}
+
+func (d *driver) nfsMount(device, target string) error {
+	command := exec.Command("mount", device, target)
+	output, err := command.CombinedOutput()
+	if err != nil {
+		return goof.WithError(fmt.Sprintf("failed mounting: %s", output), err)
+	}
+
+	return nil
+}
+
 func (d *driver) Mount(
 	device, target, mountOptions, mountLabel string) error {
 
+	if d.isNfsDevice(device) {
+		if err := d.nfsMount(device, target); err != nil {
+			return err
+		}
+		return nil
+	}
+
 	fsType, err := probeFsType(device)
 	if err != nil {
 		return err