feat(provider/azure): Enable data disk for server group (#3788)

* feat(provider/azure): Enable data disk for server group * feat(provider/azure): Enable data disk for server group
spinnaker · Jun 14, 2019 · b9b3dd0 · b9b3dd0
1 parent 6b67f22
commit b9b3dd0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 9 deletions.
diff --git a/...pinnaker/clouddriver/azure/resources/servergroup/model/AzureServerGroupDescription.groovy b/...pinnaker/clouddriver/azure/resources/servergroup/model/AzureServerGroupDescription.groovy
@@ -17,7 +17,7 @@
 package com.netflix.spinnaker.clouddriver.azure.resources.servergroup.model
 
 import com.google.common.collect.Sets
-import com.microsoft.azure.management.compute.VirtualMachineScaleSet
+import com.microsoft.azure.management.compute.VirtualMachineScaleSetDataDisk
 import com.microsoft.azure.management.compute.implementation.VirtualMachineScaleSetInner
 import com.netflix.frigga.Names
 import com.netflix.spinnaker.clouddriver.azure.AzureCloudProvider
@@ -70,6 +70,7 @@ class AzureServerGroupDescription extends AzureResourceOpsDescription implements
   Boolean createNewSubnet = false
   AzureExtensionCustomScriptSettings customScriptsSettings
   Boolean enableInboundNAT = false
+  List<VirtualMachineScaleSetDataDisk> dataDisks
 
   static class AzureScaleSetSku {
     String name
@@ -193,14 +194,17 @@ class AzureServerGroupDescription extends AzureResourceOpsDescription implements
     azureSG.upgradePolicy = getPolicyFromMode(scaleSet.upgradePolicy().mode().name())
 
     // Get the image reference data
-    def imgRef = scaleSet.virtualMachineProfile()?.storageProfile()?.imageReference()
+    def storageProfile = scaleSet.virtualMachineProfile()?.storageProfile()
+    def imgRef = storageProfile?.imageReference()
     if (imgRef) {
       azureSG.image.offer = imgRef.offer()
       azureSG.image.publisher = imgRef.publisher()
       azureSG.image.sku = imgRef.sku()
       azureSG.image.version = imgRef.version()
     }
 
+    azureSG.dataDisks = storageProfile?.dataDisks()
+
     // get the OS configuration data
     def osConfig = new AzureOperatingSystemConfig()
     def osProfile = scaleSet?.virtualMachineProfile()?.osProfile()

diff --git a/...com/netflix/spinnaker/clouddriver/azure/templates/AzureServerGroupResourceTemplate.groovy b/...com/netflix/spinnaker/clouddriver/azure/templates/AzureServerGroupResourceTemplate.groovy
@@ -33,6 +33,7 @@ package com.netflix.spinnaker.clouddriver.azure.templates
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.SerializationFeature
+import com.microsoft.azure.management.compute.VirtualMachineScaleSetDataDisk
 import com.netflix.spinnaker.clouddriver.azure.common.AzureUtilities
 import com.netflix.spinnaker.clouddriver.azure.resources.loadbalancer.model.AzureLoadBalancer
 import com.netflix.spinnaker.clouddriver.azure.resources.servergroup.model.AzureServerGroupDescription
@@ -681,13 +682,16 @@ class AzureServerGroupResourceTemplate {
 
     OSDisk osDisk
     String imageReference
+    List<VirtualMachineScaleSetDataDisk> dataDisks
+
     /**
      *
      * @param serverGroupDescription
      */
     ScaleSetStorageProfile(AzureServerGroupDescription description) {
       osDisk = new VirtualMachineOSDisk(description)
       imageReference = "[variables('imageReference')]"
+      dataDisks = description.dataDisks
     }
   }
 
@@ -705,12 +709,14 @@ class AzureServerGroupResourceTemplate {
    */
   static class ScaleSetCustomManagedImageStorageProfile implements StorageProfile {
     ImageReference imageReference
+    List<VirtualMachineScaleSetDataDisk> dataDisks
     /**
      *
      * @param serverGroupDescription
      */
     ScaleSetCustomManagedImageStorageProfile(AzureServerGroupDescription description) {
       imageReference = new ImageReference(description)
+      dataDisks = description.dataDisks
     }
   }
 

diff --git a/...ouddriver/azure/resources/servergroups/deploy/AzureServerGroupResourceTemplateSpec.groovy b/...ouddriver/azure/resources/servergroups/deploy/AzureServerGroupResourceTemplateSpec.groovy
@@ -295,7 +295,8 @@ class AzureServerGroupResourceTemplateSpec extends Specification {
             "createOption" : "FromImage",
             "vhdContainers" : [ "[concat('https://', variables('uniqueStorageNameArray')[0], '.blob.core.windows.net/', variables('vhdContainerName'))]" ]
           },
-          "imageReference" : "[variables('imageReference')]"
+          "imageReference" : "[variables('imageReference')]",
+          "dataDisks" : null
         },
         "osProfile" : {
           "computerNamePrefix" : "azureMASM-",
@@ -430,7 +431,8 @@ class AzureServerGroupResourceTemplateSpec extends Specification {
         "storageProfile" : {
           "imageReference" : {
             "id" : "/subscriptions/faab228d-df7a-4086-991e-e81c4659d41a/resourceGroups/zhqqi-sntest/providers/Microsoft.Compute/images/hello-karyon-rxnetty-all-20190125054410-ubuntu-1604"
-          }
+          },
+          "dataDisks" : null
         },
         "osProfile" : {
           "computerNamePrefix" : "azureMASM-",
@@ -598,7 +600,8 @@ class AzureServerGroupResourceTemplateSpec extends Specification {
             "createOption" : "FromImage",
             "vhdContainers" : [ "[concat('https://', variables('uniqueStorageNameArray')[0], '.blob.core.windows.net/', variables('vhdContainerName'))]" ]
           },
-          "imageReference" : "[variables('imageReference')]"
+          "imageReference" : "[variables('imageReference')]",
+          "dataDisks" : null
         },
         "osProfile" : {
           "computerNamePrefix" : "azureMASM-",
@@ -781,7 +784,8 @@ class AzureServerGroupResourceTemplateSpec extends Specification {
             "createOption" : "FromImage",
             "vhdContainers" : [ "[concat('https://', variables('uniqueStorageNameArray')[0], '.blob.core.windows.net/', variables('vhdContainerName'))]" ]
           },
-          "imageReference" : "[variables('imageReference')]"
+          "imageReference" : "[variables('imageReference')]",
+          "dataDisks" : null
         },
         "osProfile" : {
           "computerNamePrefix" : "azureMASM-",
@@ -964,7 +968,8 @@ class AzureServerGroupResourceTemplateSpec extends Specification {
             "createOption" : "FromImage",
             "vhdContainers" : [ "[concat('https://', variables('uniqueStorageNameArray')[0], '.blob.core.windows.net/', variables('vhdContainerName'))]" ]
           },
-          "imageReference" : "[variables('imageReference')]"
+          "imageReference" : "[variables('imageReference')]",
+          "dataDisks" : null
         },
         "osProfile" : {
           "computerNamePrefix" : "azureMASM-",
@@ -1148,7 +1153,8 @@ class AzureServerGroupResourceTemplateSpec extends Specification {
             "createOption" : "FromImage",
             "vhdContainers" : [ "[concat('https://', variables('uniqueStorageNameArray')[0], '.blob.core.windows.net/', variables('vhdContainerName'))]" ]
           },
-          "imageReference" : "[variables('imageReference')]"
+          "imageReference" : "[variables('imageReference')]",
+          "dataDisks" : null
         },
         "osProfile" : {
           "computerNamePrefix" : "azureMASM-",
@@ -1334,7 +1340,8 @@ class AzureServerGroupResourceTemplateSpec extends Specification {
             "createOption" : "FromImage",
             "vhdContainers" : [ "[concat('https://', variables('uniqueStorageNameArray')[0], '.blob.core.windows.net/', variables('vhdContainerName'))]" ]
           },
-          "imageReference" : "[variables('imageReference')]"
+          "imageReference" : "[variables('imageReference')]",
+          "dataDisks" : null
         },
         "osProfile" : {
           "computerNamePrefix" : "azureMASM-",