Merge pull request #76 from ibuildthecloud/network2

Assign CNI network name to label

core/compute/compute_unix.go

@@ -25,7 +25,8 @@ import (
 )
 
 var (
-	cniWaitLabel = "io.rancher.cni.wait"
+	cniWaitLabel    = "io.rancher.cni.wait"
+	cniNetworkLabel = "io.rancher.cni.network"
 )
 
 func setupPublishPorts(hostConfig *container.HostConfig, instance model.Instance) {
@@ -170,7 +171,8 @@ func setupNetworkMode(instance model.Instance, client *client.Client,
 	portsSupported := true
 	hostnameSupported := true
 	if len(instance.Nics) > 0 {
-		kind := instance.Nics[0].Network.Kind
+		network := instance.Nics[0].Network
+		kind := network.Kind
 		if kind == "dockerHost" {
 			portsSupported = false
 			hostnameSupported = false
@@ -199,8 +201,12 @@ func setupNetworkMode(instance model.Instance, client *client.Client,
 			hostConfig.Links = nil
 		} else if kind == "cni" {
 			config.Labels[cniWaitLabel] = "true"
+			if config.Labels[cniNetworkLabel] == "" && network.Name != "" {
+				config.Labels[cniNetworkLabel] = network.Name
+			}
 			portsSupported = false
-			config.NetworkDisabled = true
+			// If this is set true resolv.conf is not setup.
+			config.NetworkDisabled = false
 			hostConfig.NetworkMode = "none"
 			hostConfig.Links = nil
 		}

model/network.go

@@ -28,6 +28,7 @@ type Nic struct {
 		} `json:"subnet"`
 	} `json:"ipAddresses"`
 	Network struct {
+		Name            string `json:"name"`
 		Kind            string `json:"kind"`
 		NetworkServices []Service
 	} `json:"network"`