Skip to content

Skip non vSphere managed datastores when granting perms #7346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lcastellano merged 3 commits into from
Feb 22, 2018
Merged

Skip non vSphere managed datastores when granting perms #7346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36a328b
Skip non vSphere managed datastores when granting perms
lcastellano Feb 21, 2018
344e8e0
Merge branch 'master' into nfs
lcastellano Feb 21, 2018
4ee4009
Merge branch 'master' into nfs
lcastellano Feb 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/install/opsuser/opsuser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Copy link
Contributor

@hickeng hickeng Feb 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should move the "ds" scheme into govmomi as a constant and transition vic as a whole to using the govmomi DatastorePath structure.
Not needed for this PR however.

continue
}
volumeLocations = append(volumeLocations, *volumeLocation)
}
if err = mgr.findDatastores(ctx, finder, volumeLocations, dsNameToRef); err != nil {
Expand Down
11 changes: 11 additions & 0 deletions lib/install/validate/validator_test_sim_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down