Merge pull request #201 from crawford/configdrive

configdrive: fix root path

datasource/configdrive/configdrive.go

@@ -17,7 +17,7 @@ type configDrive struct {
 }
 
 func NewDatasource(root string) *configDrive {
-	return &configDrive{path.Join(root, "openstack"), ioutil.ReadFile}
+	return &configDrive{root, ioutil.ReadFile}
 }
 
 func (cd *configDrive) IsAvailable() bool {

datasource/configdrive/configdrive_test.go

@@ -112,3 +112,24 @@ func TestCDConfigRoot(t *testing.T) {
 		}
 	}
 }
+
+func TestNewDatasource(t *testing.T) {
+	for _, tt := range []struct {
+		root       string
+		expectRoot string
+	}{
+		{
+			root:       "",
+			expectRoot: "",
+		},
+		{
+			root:       "/media/configdrive",
+			expectRoot: "/media/configdrive",
+		},
+	} {
+		service := NewDatasource(tt.root)
+		if service.root != tt.expectRoot {
+			t.Fatalf("bad root (%q): want %q, got %q", tt.root, tt.expectRoot, service.root)
+		}
+	}
+}