Merge pull request #231 from crawford/netconf

Alex Crawford · Alex Crawford · commit db1bc51c98e5 · 2014-09-12T16:35:24.000-07:00
metadata: don't fail if no network config was provided
diff --git a/coreos-cloudinit.go b/coreos-cloudinit.go
@@ -163,7 +163,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if ccm != nil {
+	if ccm != nil && ccm.NetworkConfigPath != "" {
 		fmt.Printf("Fetching network config from datasource of type %q\n", ds.Type())
 		netconfBytes, err := ds.FetchNetworkConfig(ccm.NetworkConfigPath)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ func main() {`
`163`	`163`	`os.Exit(1)`
`164`	`164`	`}`
`165`	`165`
`166`		`- if ccm != nil {`
	`166`	`+ if ccm != nil && ccm.NetworkConfigPath != "" {`
`167`	`167`	`fmt.Printf("Fetching network config from datasource of type %q\n", ds.Type())`
`168`	`168`	`netconfBytes, err := ds.FetchNetworkConfig(ccm.NetworkConfigPath)`
`169`	`169`	`if err != nil {`