Merge pull request #63 from StrongMonkey/fix-dns

add fields before set dns
rancher · Oct 17, 2016 · dce0399 · dce0399
2 parents e42e13e + a123e3b
commit dce0399
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/core/compute/compute.go b/core/compute/compute.go
@@ -57,6 +57,10 @@ func DoInstanceActivate(instance model.Instance, host model.Host, progress *prog
 		utils.AddLabel(&config, constants.ContainerNameLabel, instanceName)
 	}
 
+	setupFieldsHostConfig(instance.Data.Fields, &hostConfig)
+
+	setupFieldsConfig(instance.Data.Fields, &config)
+
 	setupPublishPorts(&hostConfig, instance)
 
 	if err := setupDNSSearch(&hostConfig, instance); err != nil {
@@ -81,16 +85,12 @@ func DoInstanceActivate(instance model.Instance, host model.Host, progress *prog
 
 	setupCattleConfigURL(instance, &config)
 
-	setupFieldsHostConfig(instance.Data.Fields, &hostConfig)
-
 	setupNetworkingConfig(&networkConfig, instance)
 
 	setupDeviceOptions(&hostConfig, instance, infoData)
 
 	setupComputeResourceFields(&hostConfig, instance)
 
-	setupFieldsConfig(instance.Data.Fields, &config)
-
 	setupHeathConfig(instance.Data.Fields, &config)
 
 	setupLabels(instance.Data.Fields.Labels, &config)