AKS uses VHD + outbound inet test (#3826)

Author: jackfrancis

parts/k8s/kubernetescustomscript.sh

@@ -41,12 +41,13 @@ function holdWALinuxAgent() {
     fi
 }
 
+testOutboundConnection
+
 if [[ ! -z "${MASTER_NODE}" ]]; then
     installEtcd
 fi
 
 if $FULL_INSTALL_REQUIRED; then
-    testOutboundConnection
     holdWALinuxAgent
     installDeps
 else 

pkg/acsengine/defaults.go

@@ -618,7 +618,7 @@ func setAgentProfileDefaults(a *api.Properties, isUpgrade, isScale bool) {
 		// don't default Distro for OpenShift
 		if !a.OrchestratorProfile.IsOpenShift() {
 			if profile.Distro == "" {
-				if a.HostedMasterProfile != nil {
+				if profile.OSDiskSizeGB != 0 && profile.OSDiskSizeGB < api.VHDDiskSizeAKS {
 					profile.Distro = api.Ubuntu
 				} else {
 					profile.Distro = api.AKS

pkg/api/const.go

@@ -172,3 +172,8 @@ const (
 	// AgentPoolProfileRoleMaster is the master role
 	AgentPoolProfileRoleMaster AgentPoolProfileRole = "master"
 )
+
+const (
+	// VHDDiskSizeAKS maps to the OSDiskSizeGB for AKS VHD image
+	VHDDiskSizeAKS = 100
+)