Merge branch 'dev-mainnet' of https://github.com/oraclesorg/test-templates into dev-mainnet

This commit is contained in:
Pavel Khakhulin 2017-10-11 15:46:47 +03:00
commit 0167db85ad
3 changed files with 3 additions and 3 deletions

View File

@ -56,7 +56,7 @@
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
"subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
"ubuntuOSVersion": "16.04.0-LTS",
"dnsLabelPrefix": "[concat('oracles-bn-', uniqueString(parameters('nodeFullName')))]",
"dnsLabelPrefix": "[concat('oracles-bn-', uniqueString(resourceGroup().id, parameters('nodeFullName')))]",
"adminUsername": "[trim(toLower(parameters('adminUsername')))]",
"sshPublicKey": "[trim(parameters('sshPublicKey'))]",
"nodeFullName": "[trim(parameters('nodeFullName'))]",

View File

@ -74,7 +74,7 @@
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
"subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
"ubuntuOSVersion": "16.04.0-LTS",
"dnsLabelPrefix": "[toLower(concat('oracles-', uniqueString(parameters('miningAddress'))))]",
"dnsLabelPrefix": "[toLower(concat('oracles-', uniqueString(resourceGroup().id, parameters('miningAddress'))))]",
"adminUsername": "[trim(toLower(parameters('adminUsername')))]",
"sshPublicKey": "[trim(parameters('sshPublicKey'))]",
"nodeFullName": "[trim(parameters('nodeFullName'))]",

View File

@ -50,7 +50,7 @@
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
"subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
"ubuntuOSVersion": "16.04.0-LTS",
"dnsLabelPrefix": "[concat('musereum-bn-', uniqueString(parameters('nodeFullName')))]",
"dnsLabelPrefix": "[concat('musereum-bn-', uniqueString(resourceGroup().id, parameters('nodeFullName')))]",
"adminUsername": "[trim(toLower(parameters('adminUsername')))]",
"sshPublicKey": "[trim(parameters('sshPublicKey'))]",
"nodeFullName": "[trim(parameters('nodeFullName'))]",