Permalink
Browse files

Merge branch 'dev' into local-farm-token

  • Loading branch information...
ykuijs committed Sep 26, 2018
2 parents 9c9fe04 + ac22dc8 commit 577094dcd233bfd3b4c778161a0a468e2b1f221d
Showing with 5 additions and 4 deletions.
  1. +1 −1 Tests/Integration/Azure/AzureEnvironmentBuilder.psm1
  2. +4 −3 Tests/Integration/Azure/template.json
@@ -131,7 +131,7 @@ function New-SPDscAzureLab
-Context $mainStorageContext
# Get keys for software storage
$storageAccount = Find-AzureRmResource -ResourceNameContains $SoftwareStorageAccountName
$storageAccount = Get-AzureRmResource -ResourceName $SoftwareStorageAccountName
$softwareKeys = Get-AzureRmStorageAccountKey -ResourceGroupName $storageAccount.ResourceGroupName `
-Name $SoftwareStorageAccountName
@@ -70,16 +70,17 @@
}
},
"variables": {
"vmPrefix": "VM",
"networkName": "[concat(resourceGroup().Name, '-network')]",
"dcNicName": "[concat(resourceGroup().Name, '-dc-nic')]",
"dcVmName": "[concat(resourceGroup().Name, '-dc')]",
"dcVmName": "[concat(variables('vmPrefix'), '-dc')]",
"dcDisk1Name": "[concat(resourceGroup().Name, '-dc-disk-c')]",
"sqlNicName": "[concat(resourceGroup().Name, '-sql-nic')]",
"sqlVmName": "[concat(resourceGroup().Name, '-sql')]",
"sqlVmName": "[concat(variables('vmPrefix'), '-sql')]",
"sqlDisk1Name": "[concat(resourceGroup().Name, '-sql-disk-c')]",
"spIpAddressName": "[concat(resourceGroup().Name, '-sp-ip')]",
"spNicName": "[concat(resourceGroup().Name, '-sp-nic')]",
"spVmName": "[concat(resourceGroup().Name, '-sp')]",
"spVmName": "[concat(variables('vmPrefix'), '-sp')]",
"spDisk1Name": "[concat(resourceGroup().Name, '-sp-disk-c')]"
},
"resources": [

0 comments on commit 577094d

Please sign in to comment.