From af6888020d2d5a3c3774ae0ef3255f2d8eccb8d6 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Tue, 14 Mar 2017 16:19:11 +1000
Subject: [PATCH] Use a fake cloud-config struct that only contains the
 NetworkConfig - as arrays dont merge (yet)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 cmd/cloudinitsave/cloudinitsave.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/cmd/cloudinitsave/cloudinitsave.go b/cmd/cloudinitsave/cloudinitsave.go
index 887cfc48..80cc5eba 100755
--- a/cmd/cloudinitsave/cloudinitsave.go
+++ b/cmd/cloudinitsave/cloudinitsave.go
@@ -143,9 +143,16 @@ func saveFiles(cloudConfigBytes, scriptBytes []byte, metadata datasource.Metadat
 		log.Infof("not writing %s: its all defaults.", rancherConfig.CloudConfigNetworkFile)
 		return nil
 	}
+
+	type nonRancherCfg struct {
+		Network netconf.NetworkConfig `yaml:"network,omitempty"`
+	}
+	type nonCfg struct {
+		Rancher nonRancherCfg `yaml:"rancher,omitempty"`
+	}
 	// write the network.yml file from metadata
-	cc := rancherConfig.CloudConfig{
-		Rancher: rancherConfig.RancherConfig{
+	cc := nonCfg{
+		Rancher: nonRancherCfg{
 			Network: metadata.NetworkConfig,
 		},
 	}