iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9467 from ArseniiPetrovich/patch-1 

Fix data disks URI
This commit is contained in:
Wilken Rivera 2020-06-24 11:50:58 -04:00 committed by GitHub
parent 828ba95844 8d209caf34
commit 38eef12b83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/azure/arm/template_factory_test.TestVirtualMachineDeployment11.approved.json
View File

@ -149,7 +149,7 @@
"lun": 0, "lun": 0,
"name": "[concat(parameters('dataDiskName'),'-1')]", "name": "[concat(parameters('dataDiskName'),'-1')]",
"vhd": { "vhd": {
"uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-1','.vhd')]" "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/',parameters('dataDiskName'),'-1','.vhd')]"
} }
} }
], ],

2
builder/azure/common/template/template_builder.go
View File

@ -275,7 +275,7 @@ func (s *TemplateBuilder) SetAdditionalDisks(diskSizeGB []int32, dataDiskname st
dataDisks[i].ManagedDisk = profile.OsDisk.ManagedDisk dataDisks[i].ManagedDisk = profile.OsDisk.ManagedDisk
} else { } else {
dataDisks[i].Vhd = &compute.VirtualHardDisk{ dataDisks[i].Vhd = &compute.VirtualHardDisk{
URI: to.StringPtr(fmt.Sprintf("[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-%d','.vhd')]", i+1)), URI: to.StringPtr(fmt.Sprintf("[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/',parameters('dataDiskName'),'-%d','.vhd')]", i+1)),
} }
dataDisks[i].ManagedDisk = nil dataDisks[i].ManagedDisk = nil
} }

4
builder/azure/common/template/template_builder_test.TestBuildWindows02.approved.json
View File

@ -163,7 +163,7 @@
"lun": 0, "lun": 0,
"name": "[concat(parameters('dataDiskName'),'-1')]", "name": "[concat(parameters('dataDiskName'),'-1')]",
"vhd": { "vhd": {
"uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-1','.vhd')]" "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/',parameters('dataDiskName'),'-1','.vhd')]"
} }
}, },
{ {
@ -173,7 +173,7 @@
"lun": 1, "lun": 1,
"name": "[concat(parameters('dataDiskName'),'-2')]", "name": "[concat(parameters('dataDiskName'),'-2')]",
"vhd": { "vhd": {
"uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),parameters('dataDiskName'), '-2','.vhd')]" "uri": "[concat(parameters('storageAccountBlobEndpoint'),variables('vmStorageAccountContainerName'),'/',parameters('dataDiskName'),'-2','.vhd')]"
} }
} }
], ],