From 36a328b7bf788a017f80abfad2b698cd950bb3d2 Mon Sep 17 00:00:00 2001
From: Luca Castellano <lcastellano@vmware.com>
Date: Tue, 20 Feb 2018 16:13:50 -0800
Subject: [PATCH] Skip non vSphere managed datastores when granting perms

---
 lib/install/opsuser/opsuser.go                  |  4 ++++
 lib/install/validate/validator_test_sim_util.go | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/lib/install/opsuser/opsuser.go b/lib/install/opsuser/opsuser.go
index d8b7bcc3af..12f014f3a3 100644
--- a/lib/install/opsuser/opsuser.go
+++ b/lib/install/opsuser/opsuser.go
@@ -217,6 +217,10 @@ func (mgr *RBACManager) collectDatastores(ctx context.Context, finder *find.Find
 	}
 	volumeLocations := make([]url.URL, 0, len(mgr.configSpec.Storage.VolumeLocations))
 	for _, volumeLocation := range mgr.configSpec.Storage.VolumeLocations {
+		// Only apply changes to datastores managed by vSphere
+		if volumeLocation.Scheme != "ds" {
+			continue
+		}
 		volumeLocations = append(volumeLocations, *volumeLocation)
 	}
 	if err = mgr.findDatastores(ctx, finder, volumeLocations, dsNameToRef); err != nil {
diff --git a/lib/install/validate/validator_test_sim_util.go b/lib/install/validate/validator_test_sim_util.go
index c793912782..65e8fb7f3e 100644
--- a/lib/install/validate/validator_test_sim_util.go
+++ b/lib/install/validate/validator_test_sim_util.go
@@ -91,6 +91,17 @@ var testInputConfigVPX = data.Data{
 			RawQuery:   "",
 			Fragment:   "",
 		},
+		"nfs": {
+			Scheme:     "nfs",
+			Opaque:     "",
+			User:       (*url.Userinfo)(nil),
+			Host:       "nfs-host",
+			Path:       "vic-volumes:nas",
+			RawPath:    "",
+			ForceQuery: false,
+			RawQuery:   "",
+			Fragment:   "",
+		},
 	},
 	BridgeNetworkName: "DC0_DVPG0",
 	ClientNetwork: data.NetworkConfig{