coreos-cloudinit: bump to 0.10.2

configdrive: don't fail if no network config was provided

coreos-cloudinit.go

@@ -21,7 +21,7 @@ import (
 )
 
 const (
-	version               = "0.10.1"
+	version               = "0.10.2"
 	datasourceInterval    = 100 * time.Millisecond
 	datasourceMaxInterval = 30 * time.Second
 	datasourceTimeout     = 5 * time.Minute
@@ -163,7 +163,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if ccm != nil && ccm.NetworkConfigPath != "" {
+	if ccm != nil && flags.convertNetconf != "" {
 		fmt.Printf("Fetching network config from datasource of type %q\n", ds.Type())
 		netconfBytes, err := ds.FetchNetworkConfig(ccm.NetworkConfigPath)
 		if err != nil {

datasource/configdrive/configdrive.go

@@ -42,6 +42,9 @@ func (cd *configDrive) FetchUserdata() ([]byte, error) {
 }
 
 func (cd *configDrive) FetchNetworkConfig(filename string) ([]byte, error) {
+	if filename == "" {
+		return []byte{}, nil
+	}
 	return cd.tryReadFile(path.Join(cd.openstackRoot(), filename))
 }