Merge pull request rancher#310 from janeczku/fix-cloudinit-network

BUGFIX: Boot stalls for 5 mins in cloud-init-pre
sheng-liang · May 14, 2015 · d164e57 · d164e57
2 parents 893d57f + 0894639
commit d164e57
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/cmd/cloudinit/cloudinit.go b/cmd/cloudinit/cloudinit.go
@@ -393,12 +393,16 @@ func getDatasources(cfg *rancherConfig.Config) []datasource.Datasource {
 				dss = append(dss, file.NewDatasource(parts[1]))
 			}
 		case "url":
-			if len(parts) == 2 {
-				dss = append(dss, url.NewDatasource(parts[1]))
+			if network {
+				if len(parts) == 2 {
+					dss = append(dss, url.NewDatasource(parts[1]))
+				}
 			}
 		case "cmdline":
-			if len(parts) == 1 {
-				dss = append(dss, proc_cmdline.NewDatasource())
+			if network {
+				if len(parts) == 1 {
+					dss = append(dss, proc_cmdline.NewDatasource())
+				}
 			}
 		case "configdrive":
 			if len(parts) == 2 {