kitchen-azurerm 1.5.1 → 1.5.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/kitchen/driver/azurerm.rb +2 -2
- data/templates/internal.erb +4 -1
- data/templates/public.erb +4 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 20aa37ca60b29d9b0902d8741de326baa5fbe19fde0d37a9874dac2191b97b1f
|
4
|
+
data.tar.gz: f219f48b5b966faf7033fe0f78d8dd2f7638c77118c66f8c6bbae7c53e9f939c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1ca9ed3f8eb461263d65f752299e46aded16a7e9b4fd3b73a06f66bacabd7ad5c7e566be1bfc299ed9abb0514ad386807b713bdf3740969883595a64a6afb7a0
|
7
|
+
data.tar.gz: 95988ebe08533122dc27d847cc817e799f07b72e4e13666170d6515bd9b9db5e37d6568722892f30388713ce9227653e04b72899c8d7f8d657fc83f078ca12b9
|
@@ -737,10 +737,10 @@ module Kitchen
|
|
737
737
|
|
738
738
|
def virtual_machine_deployment_template
|
739
739
|
if config[:vnet_id] == ""
|
740
|
-
virtual_machine_deployment_template_file("public.erb", vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], existing_storage_account_blob_url: config[:existing_storage_account_blob_url], image_id: config[:image_id], existing_storage_account_container: config[:existing_storage_account_container], custom_data: config[:custom_data], os_disk_size_gb: config[:os_disk_size_gb], data_disks_for_vm_json: data_disks_for_vm_json, use_ephemeral_osdisk: config[:use_ephemeral_osdisk], ssh_key: instance.transport[:ssh_key], plan_json: plan_json)
|
740
|
+
virtual_machine_deployment_template_file("public.erb", vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], storage_account_type: config[:storage_account_type], existing_storage_account_blob_url: config[:existing_storage_account_blob_url], image_id: config[:image_id], existing_storage_account_container: config[:existing_storage_account_container], custom_data: config[:custom_data], os_disk_size_gb: config[:os_disk_size_gb], data_disks_for_vm_json: data_disks_for_vm_json, use_ephemeral_osdisk: config[:use_ephemeral_osdisk], ssh_key: instance.transport[:ssh_key], plan_json: plan_json)
|
741
741
|
else
|
742
742
|
info "Using custom vnet: #{config[:vnet_id]}"
|
743
|
-
virtual_machine_deployment_template_file("internal.erb", vnet_id: config[:vnet_id], subnet_id: config[:subnet_id], public_ip: config[:public_ip], vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], existing_storage_account_blob_url: config[:existing_storage_account_blob_url], image_id: config[:image_id], existing_storage_account_container: config[:existing_storage_account_container], custom_data: config[:custom_data], os_disk_size_gb: config[:os_disk_size_gb], data_disks_for_vm_json: data_disks_for_vm_json, use_ephemeral_osdisk: config[:use_ephemeral_osdisk], ssh_key: instance.transport[:ssh_key], public_ip_sku: config[:public_ip_sku], plan_json: plan_json)
|
743
|
+
virtual_machine_deployment_template_file("internal.erb", vnet_id: config[:vnet_id], subnet_id: config[:subnet_id], public_ip: config[:public_ip], vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], storage_account_type: config[:storage_account_type], existing_storage_account_blob_url: config[:existing_storage_account_blob_url], image_id: config[:image_id], existing_storage_account_container: config[:existing_storage_account_container], custom_data: config[:custom_data], os_disk_size_gb: config[:os_disk_size_gb], data_disks_for_vm_json: data_disks_for_vm_json, use_ephemeral_osdisk: config[:use_ephemeral_osdisk], ssh_key: instance.transport[:ssh_key], public_ip_sku: config[:public_ip_sku], plan_json: plan_json)
|
744
744
|
end
|
745
745
|
end
|
746
746
|
|
data/templates/internal.erb
CHANGED
@@ -181,7 +181,7 @@
|
|
181
181
|
},
|
182
182
|
"storageAccountType": {
|
183
183
|
"type": "string",
|
184
|
-
"defaultValue": "
|
184
|
+
"defaultValue": "<%= storage_account_type %>",
|
185
185
|
"metadata": {
|
186
186
|
"description": "The type of storage to use (e.g. Standard_LRS or Premium_LRS)."
|
187
187
|
}
|
@@ -374,6 +374,9 @@
|
|
374
374
|
<%- unless os_disk_size_gb.to_s.empty? -%>
|
375
375
|
"diskSizeGB": "[parameters('osDiskSizeGB')]",
|
376
376
|
<%- end -%>
|
377
|
+
"managedDisk": {
|
378
|
+
"storageAccountType": "[parameters('storageAccountType')]"
|
379
|
+
},
|
377
380
|
"createOption": "FromImage"
|
378
381
|
}
|
379
382
|
<%- else -%>
|
data/templates/public.erb
CHANGED
@@ -165,7 +165,7 @@
|
|
165
165
|
},
|
166
166
|
"storageAccountType": {
|
167
167
|
"type": "string",
|
168
|
-
"defaultValue": "
|
168
|
+
"defaultValue": "<%= storage_account_type %>",
|
169
169
|
"metadata": {
|
170
170
|
"description": "The type of storage to use (e.g. Standard_LRS or Premium_LRS)."
|
171
171
|
}
|
@@ -375,6 +375,9 @@
|
|
375
375
|
<%- unless os_disk_size_gb.to_s.empty? -%>
|
376
376
|
"diskSizeGB": "[parameters('osDiskSizeGB')]",
|
377
377
|
<%- end -%>
|
378
|
+
"managedDisk": {
|
379
|
+
"storageAccountType": "[parameters('storageAccountType')]"
|
380
|
+
},
|
378
381
|
"createOption": "FromImage"
|
379
382
|
}
|
380
383
|
<%- else -%>
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kitchen-azurerm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.5.
|
4
|
+
version: 1.5.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Stuart Preston
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-02-
|
11
|
+
date: 2021-02-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: azure_mgmt_network
|