Merge pull request #1256 from joshwget/move-packet-datasource

Move Packet datasource from cloud-init-pre to cloud-init

cmd/cloudinitsave/cloudinitsave.go

@@ -108,6 +108,11 @@ func currentDatasource() (datasource.Datasource, error) {
 	}
 
 	ds := selectDatasource(dss)
+
+	if ds.Type() == "packet-metadata-service" {
+		enablePacketNetwork(&cfg.Rancher)
+	}
+
 	return ds, nil
 }
 
@@ -220,10 +225,9 @@ func getDatasources(cfg *rancherConfig.CloudConfig) []datasource.Datasource {
 				dss = append(dss, gce.NewDatasource("http://metadata.google.internal/"))
 			}
 		case "packet":
-			if !network {
-				enablePacketNetwork(&cfg.Rancher)
+			if network {
+				dss = append(dss, packet.NewDatasource("https://metadata.packet.net/"))
 			}
-			dss = append(dss, packet.NewDatasource("https://metadata.packet.net/"))
 		}
 	}
 

cmd/cloudinitsave/packet.go

@@ -16,22 +16,6 @@ import (
 )
 
 func enablePacketNetwork(cfg *rancherConfig.RancherConfig) {
-	bootStrapped := false
-	for _, v := range cfg.Network.Interfaces {
-		if v.Address != "" {
-			if err := netconf.ApplyNetworkConfigs(&cfg.Network); err != nil {
-				logrus.Errorf("Failed to bootstrap network: %v", err)
-				return
-			}
-			bootStrapped = true
-			break
-		}
-	}
-
-	if !bootStrapped {
-		return
-	}
-
 	c := metadata.NewClient(http.DefaultClient)
 	m, err := c.Metadata.Get()
 	if err != nil {