Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rollback #228 #234

Merged
merged 1 commit into from
Mar 10, 2022
Merged

rollback #228 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions lib/kitchen/driver/azurerm.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
4 changes: 0 additions & 4 deletions spec/unit/kitchen/driver/azurerm_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 0 additions & 19 deletions templates/internal.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -220,7 +208,6 @@
},
"variables": {
"location": "[parameters('location')]",
"zone": "[parameters('zone')]",
"OSDiskName": "osdisk",
"nicName": "[parameters('nicName')]",
"addressPrefix": "10.0.0.0/16",
Expand Down Expand Up @@ -272,9 +259,6 @@
"type": "Microsoft.Network/publicIPAddresses",
"name": "[variables('publicIPAddressName')]",
"location": "[variables('location')]",
"zones": [
"[variables('zone')]"
],
"sku": {
"name": "[parameters('publicIPSKU')]"
},
Expand Down Expand Up @@ -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? -%>
Expand Down