Merge pull request #6390 from stgraber/storage

lxd/storage: Fix custom volume with underscores
lxc · Nov 4, 2019 · 6c4f775 · 6c4f775
2 parents 586ed15 + a7e28cb
commit 6c4f775
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lxd/storage/load.go b/lxd/storage/load.go
@@ -34,10 +34,12 @@ func volIDFuncMake(state *state.State, poolID int64) func(volType drivers.Volume
 		// encoding format, so if there is no underscore in the volume name then we assume
 		// the project is default.
 		project := "default"
-		volParts := strings.SplitN(volName, "_", 2)
-		if len(volParts) > 1 {
-			project = volParts[0]
-			volName = volParts[1]
+		if volType == drivers.VolumeTypeContainer || volType == drivers.VolumeTypeVM {
+			volParts := strings.SplitN(volName, "_", 2)
+			if len(volParts) > 1 {
+				project = volParts[0]
+				volName = volParts[1]
+			}
 		}
 
 		volID, _, err := state.Cluster.StoragePoolNodeVolumeGetTypeByProject(project, volName, volTypeID, poolID)