Merge pull request rancher#2614 from Jason-ZW/add-azure-image

Add azure support

Author: niusmallnan

Dockerfile.dapper

@@ -88,6 +88,7 @@ ARG USER_DOCKER_VERSION=18.06.1
 ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}-ce
 
 ARG VMWARE_AUTOFORMAT=1
+ARG AZURE_SERVICE=false
 ######################################################
 
 # Set up environment and export all ARGS as ENV
@@ -126,7 +127,8 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
     SYSTEM_DOCKER_URL_arm64=${SYSTEM_DOCKER_URL_arm64} \
     USER_DOCKER_VERSION=${USER_DOCKER_VERSION} \
     USER_DOCKER_ENGINE_VERSION=${USER_DOCKER_ENGINE_VERSION} \
-    VMWARE_AUTOFORMAT=${VMWARE_AUTOFORMAT}
+    VMWARE_AUTOFORMAT=${VMWARE_AUTOFORMAT} \
+    AZURE_SERVICE=${AZURE_SERVICE}
 ENV PATH=${GOPATH}/bin:/usr/local/go/bin:$PATH
 
 RUN mkdir -p ${DOWNLOADS}

Makefile

@@ -57,6 +57,12 @@ hyperv: .dapper
 	APPEND_SYSTEM_IMAGES="rancher/os-hypervvmtools:v4.14.85-rancher-1" \
 	./.dapper release-hyperv 2>&1 | tee dist/release.log
 
+azure: .dapper
+	mkdir -p dist
+	AZURE_SERVICE="true" \
+	APPEND_SYSTEM_IMAGES="rancher/os-hypervvmtools:v4.14.85-rancher-1 rancher/os-waagent:v2.2.34-1" \
+	./.dapper release-azure 2>&1 | tee dist/release.log
+
 4glte: .dapper
 	mkdir -p dist
 	APPEND_SYSTEM_IMAGES="rancher/os-modemmanager:v1.6.4-1" \

cmd/cloudinitsave/cloudinitsave.go

@@ -97,23 +97,6 @@ func saveCloudConfig() error {
 	return nil
 }
 
-func RequiresNetwork(datasource string) bool {
-	// TODO: move into the datasources (and metadatasources)
-	// and then we can enable that platforms defaults..
-	parts := strings.SplitN(datasource, ":", 2)
-	requiresNetwork, ok := map[string]bool{
-		"ec2":          true,
-		"file":         false,
-		"url":          true,
-		"cmdline":      true,
-		"configdrive":  false,
-		"digitalocean": true,
-		"gce":          true,
-		"packet":       true,
-	}[parts[0]]
-	return ok && requiresNetwork
-}
-
 func saveFiles(cloudConfigBytes, scriptBytes []byte, metadata datasource.Metadata) error {
 	os.MkdirAll(rancherConfig.CloudConfigDir, os.ModeDir|0600)
 

config/cloudinit/datasource/waagent/waagent.go

@@ -21,6 +21,10 @@ rancher:
   ssh:
     daemon: true
   hypervisor_service: true
+  services_include:
+  {{if eq "true" .AZURE_SERVICE -}}
+    waagent: true
+  {{end -}}
   bootstrap:
     bootstrap:
       image: {{.OS_REPO}}/os-bootstrap:{{.VERSION}}{{.SUFFIX}}
@@ -130,6 +134,7 @@ rancher:
       - /var/lib/rancher/cache:/var/lib/rancher/cache
       - /var/lib/rancher/conf:/var/lib/rancher/conf
       - /var/lib/rancher:/var/lib/rancher
+      - /var/lib/waagent:/var/lib/waagent
       - /var/log:/var/log
       - /var/run:/var/run
     container-data-volumes:

config/cloudinit/datasource/waagent/waagent_test.go

@@ -26,7 +26,7 @@ func LoadModules(cfg *config.CloudConfig) (*config.CloudConfig, error) {
 	}
 
 	if util.GetHypervisor() == "hyperv" {
-		cfg.Rancher.Modules = append(cfg.Rancher.Modules, "hv_utils", "hv_storvsc")
+		cfg.Rancher.Modules = append(cfg.Rancher.Modules, "hv_utils", "hv_storvsc", "hv_vmbus")
 	}
 
 	for _, module := range cfg.Rancher.Modules {

os-config.tpl.yml

@@ -58,6 +58,9 @@ for file in $(ls .make-*); do
         ".make-hyperv")
             cache_services "h/hyperv-vm-tools.yml"
             ;;
+        ".make-azure")
+            cache_services "h/hyperv-vm-tools.yml w/waagent.yml"
+            ;;
     esac
 done
 case ${OS_CONSOLE} in