rollback #228 (#234)

Signed-off-by: Jason Barnett <[email protected]>
test-kitchen · Mar 10, 2022 · 0d2d71d · 0d2d71d
1 parent db329cd
commit 0d2d71d
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 28 deletions.
diff --git a/lib/kitchen/driver/azurerm.rb b/lib/kitchen/driver/azurerm.rb
@@ -220,15 +220,10 @@ class Azurerm < Kitchen::Driver::Base
         false
       end
 
-      default_config(:zone) do |_config|
-        "1"
-      end
-
       def create(state)
         state = validate_state(state)
         deployment_parameters = {
           location: config[:location],
-          zone: config[:zone],
           vmSize: config[:machine_size],
           storageAccountType: config[:storage_account_type],
           bootDiagnosticsEnabled: config[:boot_diagnostics_enabled],

diff --git a/spec/unit/kitchen/driver/azurerm_spec.rb b/spec/unit/kitchen/driver/azurerm_spec.rb
@@ -107,10 +107,6 @@
       expect(default_config[:public_ip_sku]).to eq("Basic")
     end
 
-    it "Should use 1 availability zone" do
-      expect(default_config[:zone]).to eq("1")
-    end
-
     it "should set store_deployment_credentials_in_state to true" do
       expect(default_config[:store_deployment_credentials_in_state]).to eq(true)
     end

diff --git a/templates/internal.erb b/templates/internal.erb
@@ -8,18 +8,6 @@
                 "description": "The location where the resources will be created."
             }
         },
-        "zone": {
-            "type": "string",
-            "defaultValue": "1",
-            "allowedValues": [
-                "1",
-                "2",
-                "3"
-            ],
-            "metadata": {
-                "description": "Zone number for the virtual machine"
-            }
-        },
         "vmSize": {
             "type": "string",
             "metadata": {
@@ -220,7 +208,6 @@
     },
     "variables": {
         "location": "[parameters('location')]",
-        "zone": "[parameters('zone')]",
         "OSDiskName": "osdisk",
         "nicName": "[parameters('nicName')]",
         "addressPrefix": "10.0.0.0/16",
@@ -272,9 +259,6 @@
             "type": "Microsoft.Network/publicIPAddresses",
             "name": "[variables('publicIPAddressName')]",
             "location": "[variables('location')]",
-            "zones": [
-                "[variables('zone')]"
-            ],
             "sku": {
               "name": "[parameters('publicIPSKU')]"
             },
@@ -326,9 +310,6 @@
             "type": "Microsoft.Compute/virtualMachines",
             "name": "[variables('vmName')]",
             "location": "[variables('location')]",
-            "zones": [
-                "[variables('zone')]"
-            ],
             "dependsOn": [
                 <%- unless use_managed_disks -%>
                 <%- if existing_storage_account_blob_url.empty? -%>