mirror of https://github.com/OpenVidu/openvidu.git
openvidu-deployment: Azure - Fix wrong sku and offer for ubuntu 24
parent
7bc782b7c0
commit
aa08432ea8
|
|
@ -72,7 +72,7 @@ var isEmptyDomain = domainName == ''
|
||||||
var instanceTypeLower = toLower(instanceType)
|
var instanceTypeLower = toLower(instanceType)
|
||||||
var isArm64Instance = contains(instanceTypeLower, 'ps_v') || contains(instanceTypeLower, 'pls_v') || contains(instanceTypeLower, 'pds_v') || contains(instanceTypeLower, 'plds_v') || contains(instanceTypeLower, 'psv') || contains(instanceTypeLower, 'plsv') || contains(instanceTypeLower, 'pdsv') || contains(instanceTypeLower, 'pldsv')
|
var isArm64Instance = contains(instanceTypeLower, 'ps_v') || contains(instanceTypeLower, 'pls_v') || contains(instanceTypeLower, 'pds_v') || contains(instanceTypeLower, 'plds_v') || contains(instanceTypeLower, 'psv') || contains(instanceTypeLower, 'plsv') || contains(instanceTypeLower, 'pdsv') || contains(instanceTypeLower, 'pldsv')
|
||||||
|
|
||||||
var ubuntuSku = isArm64Instance ? '24_04-lts-arm64' : '24_04-lts-gen2'
|
var ubuntuSku = isArm64Instance ? 'server-arm64' : 'server'
|
||||||
|
|
||||||
//Variables for deployment
|
//Variables for deployment
|
||||||
var networkSettings = {
|
var networkSettings = {
|
||||||
|
|
@ -89,7 +89,7 @@ var openviduVMSettings = {
|
||||||
osDiskType: 'StandardSSD_LRS'
|
osDiskType: 'StandardSSD_LRS'
|
||||||
ubuntuOSVersion: {
|
ubuntuOSVersion: {
|
||||||
publisher: 'Canonical'
|
publisher: 'Canonical'
|
||||||
offer: '0001-com-ubuntu-server-noble'
|
offer: 'ubuntu-24_04-lts'
|
||||||
sku: ubuntuSku
|
sku: ubuntuSku
|
||||||
version: 'latest'
|
version: 'latest'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
"_generator": {
|
"_generator": {
|
||||||
"name": "bicep",
|
"name": "bicep",
|
||||||
"version": "0.37.4.10188",
|
"version": "0.37.4.10188",
|
||||||
"templateHash": "15500404754597159784"
|
"templateHash": "4087584023028910341"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"parameters": {
|
"parameters": {
|
||||||
|
|
@ -132,7 +132,7 @@
|
||||||
"isEmptyDomain": "[equals(parameters('domainName'), '')]",
|
"isEmptyDomain": "[equals(parameters('domainName'), '')]",
|
||||||
"instanceTypeLower": "[toLower(parameters('instanceType'))]",
|
"instanceTypeLower": "[toLower(parameters('instanceType'))]",
|
||||||
"isArm64Instance": "[or(or(or(or(or(or(or(contains(variables('instanceTypeLower'), 'ps_v'), contains(variables('instanceTypeLower'), 'pls_v')), contains(variables('instanceTypeLower'), 'pds_v')), contains(variables('instanceTypeLower'), 'plds_v')), contains(variables('instanceTypeLower'), 'psv')), contains(variables('instanceTypeLower'), 'plsv')), contains(variables('instanceTypeLower'), 'pdsv')), contains(variables('instanceTypeLower'), 'pldsv'))]",
|
"isArm64Instance": "[or(or(or(or(or(or(or(contains(variables('instanceTypeLower'), 'ps_v'), contains(variables('instanceTypeLower'), 'pls_v')), contains(variables('instanceTypeLower'), 'pds_v')), contains(variables('instanceTypeLower'), 'plds_v')), contains(variables('instanceTypeLower'), 'psv')), contains(variables('instanceTypeLower'), 'plsv')), contains(variables('instanceTypeLower'), 'pdsv')), contains(variables('instanceTypeLower'), 'pldsv'))]",
|
||||||
"ubuntuSku": "[if(variables('isArm64Instance'), '24_04-lts-arm64', '24_04-lts-gen2')]",
|
"ubuntuSku": "[if(variables('isArm64Instance'), 'server-arm64', 'server')]",
|
||||||
"networkSettings": {
|
"networkSettings": {
|
||||||
"privateIPaddressNetInterface": "10.0.0.5",
|
"privateIPaddressNetInterface": "10.0.0.5",
|
||||||
"vNetAddressPrefix": "10.0.0.0/16",
|
"vNetAddressPrefix": "10.0.0.0/16",
|
||||||
|
|
@ -146,7 +146,7 @@
|
||||||
"osDiskType": "StandardSSD_LRS",
|
"osDiskType": "StandardSSD_LRS",
|
||||||
"ubuntuOSVersion": {
|
"ubuntuOSVersion": {
|
||||||
"publisher": "Canonical",
|
"publisher": "Canonical",
|
||||||
"offer": "0001-com-ubuntu-server-noble",
|
"offer": "ubuntu-24_04-lts",
|
||||||
"sku": "[variables('ubuntuSku')]",
|
"sku": "[variables('ubuntuSku')]",
|
||||||
"version": "latest"
|
"version": "latest"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -95,15 +95,15 @@ var mediaNodeInstanceTypeLower = toLower(mediaNodeInstanceType)
|
||||||
var isMasterArm64 = contains(masterNodeInstanceTypeLower, 'ps_v') || contains(masterNodeInstanceTypeLower, 'pls_v') || contains(masterNodeInstanceTypeLower, 'pds_v') || contains(masterNodeInstanceTypeLower, 'plds_v') || contains(masterNodeInstanceTypeLower, 'psv') || contains(masterNodeInstanceTypeLower, 'plsv') || contains(masterNodeInstanceTypeLower, 'pdsv') || contains(masterNodeInstanceTypeLower, 'pldsv')
|
var isMasterArm64 = contains(masterNodeInstanceTypeLower, 'ps_v') || contains(masterNodeInstanceTypeLower, 'pls_v') || contains(masterNodeInstanceTypeLower, 'pds_v') || contains(masterNodeInstanceTypeLower, 'plds_v') || contains(masterNodeInstanceTypeLower, 'psv') || contains(masterNodeInstanceTypeLower, 'plsv') || contains(masterNodeInstanceTypeLower, 'pdsv') || contains(masterNodeInstanceTypeLower, 'pldsv')
|
||||||
var isMediaArm64 = contains(mediaNodeInstanceTypeLower, 'ps_v') || contains(mediaNodeInstanceTypeLower, 'pls_v') || contains(mediaNodeInstanceTypeLower, 'pds_v') || contains(mediaNodeInstanceTypeLower, 'plds_v') || contains(mediaNodeInstanceTypeLower, 'psv') || contains(mediaNodeInstanceTypeLower, 'plsv') || contains(mediaNodeInstanceTypeLower, 'pdsv') || contains(mediaNodeInstanceTypeLower, 'pldsv')
|
var isMediaArm64 = contains(mediaNodeInstanceTypeLower, 'ps_v') || contains(mediaNodeInstanceTypeLower, 'pls_v') || contains(mediaNodeInstanceTypeLower, 'pds_v') || contains(mediaNodeInstanceTypeLower, 'plds_v') || contains(mediaNodeInstanceTypeLower, 'psv') || contains(mediaNodeInstanceTypeLower, 'plsv') || contains(mediaNodeInstanceTypeLower, 'pdsv') || contains(mediaNodeInstanceTypeLower, 'pldsv')
|
||||||
|
|
||||||
var masterUbuntuSku = isMasterArm64 ? '24_04-lts-arm64' : '24_04-lts-gen2'
|
var masterUbuntuSku = isMasterArm64 ? 'server-arm64' : 'server'
|
||||||
var mediaUbuntuSku = isMediaArm64 ? '24_04-lts-arm64' : '24_04-lts-gen2'
|
var mediaUbuntuSku = isMediaArm64 ? 'server-arm64' : 'server'
|
||||||
|
|
||||||
var masterNodeVMSettings = {
|
var masterNodeVMSettings = {
|
||||||
vmName: '${stackName}-VM-MasterNode'
|
vmName: '${stackName}-VM-MasterNode'
|
||||||
osDiskType: 'StandardSSD_LRS'
|
osDiskType: 'StandardSSD_LRS'
|
||||||
ubuntuOSVersion: {
|
ubuntuOSVersion: {
|
||||||
publisher: 'Canonical'
|
publisher: 'Canonical'
|
||||||
offer: '0001-com-ubuntu-server-noble'
|
offer: 'ubuntu-24_04-lts'
|
||||||
sku: masterUbuntuSku
|
sku: masterUbuntuSku
|
||||||
version: 'latest'
|
version: 'latest'
|
||||||
}
|
}
|
||||||
|
|
@ -125,7 +125,7 @@ var mediaNodeVMSettings = {
|
||||||
osDiskType: 'StandardSSD_LRS'
|
osDiskType: 'StandardSSD_LRS'
|
||||||
ubuntuOSVersion: {
|
ubuntuOSVersion: {
|
||||||
publisher: 'Canonical'
|
publisher: 'Canonical'
|
||||||
offer: '0001-com-ubuntu-server-noble'
|
offer: 'ubuntu-24_04-lts'
|
||||||
sku: mediaUbuntuSku
|
sku: mediaUbuntuSku
|
||||||
version: 'latest'
|
version: 'latest'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
"_generator": {
|
"_generator": {
|
||||||
"name": "bicep",
|
"name": "bicep",
|
||||||
"version": "0.37.4.10188",
|
"version": "0.37.4.10188",
|
||||||
"templateHash": "11064671770283732977"
|
"templateHash": "8060384200177337036"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"parameters": {
|
"parameters": {
|
||||||
|
|
@ -197,14 +197,14 @@
|
||||||
"mediaNodeInstanceTypeLower": "[toLower(parameters('mediaNodeInstanceType'))]",
|
"mediaNodeInstanceTypeLower": "[toLower(parameters('mediaNodeInstanceType'))]",
|
||||||
"isMasterArm64": "[or(or(or(or(or(or(or(contains(variables('masterNodeInstanceTypeLower'), 'ps_v'), contains(variables('masterNodeInstanceTypeLower'), 'pls_v')), contains(variables('masterNodeInstanceTypeLower'), 'pds_v')), contains(variables('masterNodeInstanceTypeLower'), 'plds_v')), contains(variables('masterNodeInstanceTypeLower'), 'psv')), contains(variables('masterNodeInstanceTypeLower'), 'plsv')), contains(variables('masterNodeInstanceTypeLower'), 'pdsv')), contains(variables('masterNodeInstanceTypeLower'), 'pldsv'))]",
|
"isMasterArm64": "[or(or(or(or(or(or(or(contains(variables('masterNodeInstanceTypeLower'), 'ps_v'), contains(variables('masterNodeInstanceTypeLower'), 'pls_v')), contains(variables('masterNodeInstanceTypeLower'), 'pds_v')), contains(variables('masterNodeInstanceTypeLower'), 'plds_v')), contains(variables('masterNodeInstanceTypeLower'), 'psv')), contains(variables('masterNodeInstanceTypeLower'), 'plsv')), contains(variables('masterNodeInstanceTypeLower'), 'pdsv')), contains(variables('masterNodeInstanceTypeLower'), 'pldsv'))]",
|
||||||
"isMediaArm64": "[or(or(or(or(or(or(or(contains(variables('mediaNodeInstanceTypeLower'), 'ps_v'), contains(variables('mediaNodeInstanceTypeLower'), 'pls_v')), contains(variables('mediaNodeInstanceTypeLower'), 'pds_v')), contains(variables('mediaNodeInstanceTypeLower'), 'plds_v')), contains(variables('mediaNodeInstanceTypeLower'), 'psv')), contains(variables('mediaNodeInstanceTypeLower'), 'plsv')), contains(variables('mediaNodeInstanceTypeLower'), 'pdsv')), contains(variables('mediaNodeInstanceTypeLower'), 'pldsv'))]",
|
"isMediaArm64": "[or(or(or(or(or(or(or(contains(variables('mediaNodeInstanceTypeLower'), 'ps_v'), contains(variables('mediaNodeInstanceTypeLower'), 'pls_v')), contains(variables('mediaNodeInstanceTypeLower'), 'pds_v')), contains(variables('mediaNodeInstanceTypeLower'), 'plds_v')), contains(variables('mediaNodeInstanceTypeLower'), 'psv')), contains(variables('mediaNodeInstanceTypeLower'), 'plsv')), contains(variables('mediaNodeInstanceTypeLower'), 'pdsv')), contains(variables('mediaNodeInstanceTypeLower'), 'pldsv'))]",
|
||||||
"masterUbuntuSku": "[if(variables('isMasterArm64'), '24_04-lts-arm64', '24_04-lts-gen2')]",
|
"masterUbuntuSku": "[if(variables('isMasterArm64'), 'server-arm64', 'server')]",
|
||||||
"mediaUbuntuSku": "[if(variables('isMediaArm64'), '24_04-lts-arm64', '24_04-lts-gen2')]",
|
"mediaUbuntuSku": "[if(variables('isMediaArm64'), 'server-arm64', 'server')]",
|
||||||
"masterNodeVMSettings": {
|
"masterNodeVMSettings": {
|
||||||
"vmName": "[format('{0}-VM-MasterNode', parameters('stackName'))]",
|
"vmName": "[format('{0}-VM-MasterNode', parameters('stackName'))]",
|
||||||
"osDiskType": "StandardSSD_LRS",
|
"osDiskType": "StandardSSD_LRS",
|
||||||
"ubuntuOSVersion": {
|
"ubuntuOSVersion": {
|
||||||
"publisher": "Canonical",
|
"publisher": "Canonical",
|
||||||
"offer": "0001-com-ubuntu-server-noble",
|
"offer": "ubuntu-24_04-lts",
|
||||||
"sku": "[variables('masterUbuntuSku')]",
|
"sku": "[variables('masterUbuntuSku')]",
|
||||||
"version": "latest"
|
"version": "latest"
|
||||||
},
|
},
|
||||||
|
|
@ -225,7 +225,7 @@
|
||||||
"osDiskType": "StandardSSD_LRS",
|
"osDiskType": "StandardSSD_LRS",
|
||||||
"ubuntuOSVersion": {
|
"ubuntuOSVersion": {
|
||||||
"publisher": "Canonical",
|
"publisher": "Canonical",
|
||||||
"offer": "0001-com-ubuntu-server-noble",
|
"offer": "ubuntu-24_04-lts",
|
||||||
"sku": "[variables('mediaUbuntuSku')]",
|
"sku": "[variables('mediaUbuntuSku')]",
|
||||||
"version": "latest"
|
"version": "latest"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -98,15 +98,15 @@ var mediaNodeInstanceTypeLower = toLower(mediaNodeInstanceType)
|
||||||
var isMasterArm64 = contains(masterNodeInstanceTypeLower, 'ps_v') || contains(masterNodeInstanceTypeLower, 'pls_v') || contains(masterNodeInstanceTypeLower, 'pds_v') || contains(masterNodeInstanceTypeLower, 'plds_v') || contains(masterNodeInstanceTypeLower, 'psv') || contains(masterNodeInstanceTypeLower, 'plsv') || contains(masterNodeInstanceTypeLower, 'pdsv') || contains(masterNodeInstanceTypeLower, 'pldsv')
|
var isMasterArm64 = contains(masterNodeInstanceTypeLower, 'ps_v') || contains(masterNodeInstanceTypeLower, 'pls_v') || contains(masterNodeInstanceTypeLower, 'pds_v') || contains(masterNodeInstanceTypeLower, 'plds_v') || contains(masterNodeInstanceTypeLower, 'psv') || contains(masterNodeInstanceTypeLower, 'plsv') || contains(masterNodeInstanceTypeLower, 'pdsv') || contains(masterNodeInstanceTypeLower, 'pldsv')
|
||||||
var isMediaArm64 = contains(mediaNodeInstanceTypeLower, 'ps_v') || contains(mediaNodeInstanceTypeLower, 'pls_v') || contains(mediaNodeInstanceTypeLower, 'pds_v') || contains(mediaNodeInstanceTypeLower, 'plds_v') || contains(mediaNodeInstanceTypeLower, 'psv') || contains(mediaNodeInstanceTypeLower, 'plsv') || contains(mediaNodeInstanceTypeLower, 'pdsv') || contains(mediaNodeInstanceTypeLower, 'pldsv')
|
var isMediaArm64 = contains(mediaNodeInstanceTypeLower, 'ps_v') || contains(mediaNodeInstanceTypeLower, 'pls_v') || contains(mediaNodeInstanceTypeLower, 'pds_v') || contains(mediaNodeInstanceTypeLower, 'plds_v') || contains(mediaNodeInstanceTypeLower, 'psv') || contains(mediaNodeInstanceTypeLower, 'plsv') || contains(mediaNodeInstanceTypeLower, 'pdsv') || contains(mediaNodeInstanceTypeLower, 'pldsv')
|
||||||
|
|
||||||
var masterUbuntuSku = isMasterArm64 ? '24_04-lts-arm64' : '24_04-lts-gen2'
|
var masterUbuntuSku = isMasterArm64 ? 'server-arm64' : 'server'
|
||||||
var mediaUbuntuSku = isMediaArm64 ? '24_04-lts-arm64' : '24_04-lts-gen2'
|
var mediaUbuntuSku = isMediaArm64 ? 'server-arm64' : 'server'
|
||||||
|
|
||||||
var masterNodeVMSettings = {
|
var masterNodeVMSettings = {
|
||||||
osDiskType: 'StandardSSD_LRS'
|
osDiskType: 'StandardSSD_LRS'
|
||||||
osDiskSize: masterNodesDiskSize
|
osDiskSize: masterNodesDiskSize
|
||||||
ubuntuOSVersion: {
|
ubuntuOSVersion: {
|
||||||
publisher: 'Canonical'
|
publisher: 'Canonical'
|
||||||
offer: '0001-com-ubuntu-server-noble'
|
offer: 'ubuntu-24_04-lts'
|
||||||
sku: masterUbuntuSku
|
sku: masterUbuntuSku
|
||||||
version: 'latest'
|
version: 'latest'
|
||||||
}
|
}
|
||||||
|
|
@ -128,7 +128,7 @@ var mediaNodeVMSettings = {
|
||||||
osDiskType: 'StandardSSD_LRS'
|
osDiskType: 'StandardSSD_LRS'
|
||||||
ubuntuOSVersion: {
|
ubuntuOSVersion: {
|
||||||
publisher: 'Canonical'
|
publisher: 'Canonical'
|
||||||
offer: '0001-com-ubuntu-server-noble'
|
offer: 'ubuntu-24_04-lts'
|
||||||
sku: mediaUbuntuSku
|
sku: mediaUbuntuSku
|
||||||
version: 'latest'
|
version: 'latest'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
"_generator": {
|
"_generator": {
|
||||||
"name": "bicep",
|
"name": "bicep",
|
||||||
"version": "0.37.4.10188",
|
"version": "0.37.4.10188",
|
||||||
"templateHash": "4723246277088565564"
|
"templateHash": "16829119904455177602"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"parameters": {
|
"parameters": {
|
||||||
|
|
@ -211,14 +211,14 @@
|
||||||
"mediaNodeInstanceTypeLower": "[toLower(parameters('mediaNodeInstanceType'))]",
|
"mediaNodeInstanceTypeLower": "[toLower(parameters('mediaNodeInstanceType'))]",
|
||||||
"isMasterArm64": "[or(or(or(or(or(or(or(contains(variables('masterNodeInstanceTypeLower'), 'ps_v'), contains(variables('masterNodeInstanceTypeLower'), 'pls_v')), contains(variables('masterNodeInstanceTypeLower'), 'pds_v')), contains(variables('masterNodeInstanceTypeLower'), 'plds_v')), contains(variables('masterNodeInstanceTypeLower'), 'psv')), contains(variables('masterNodeInstanceTypeLower'), 'plsv')), contains(variables('masterNodeInstanceTypeLower'), 'pdsv')), contains(variables('masterNodeInstanceTypeLower'), 'pldsv'))]",
|
"isMasterArm64": "[or(or(or(or(or(or(or(contains(variables('masterNodeInstanceTypeLower'), 'ps_v'), contains(variables('masterNodeInstanceTypeLower'), 'pls_v')), contains(variables('masterNodeInstanceTypeLower'), 'pds_v')), contains(variables('masterNodeInstanceTypeLower'), 'plds_v')), contains(variables('masterNodeInstanceTypeLower'), 'psv')), contains(variables('masterNodeInstanceTypeLower'), 'plsv')), contains(variables('masterNodeInstanceTypeLower'), 'pdsv')), contains(variables('masterNodeInstanceTypeLower'), 'pldsv'))]",
|
||||||
"isMediaArm64": "[or(or(or(or(or(or(or(contains(variables('mediaNodeInstanceTypeLower'), 'ps_v'), contains(variables('mediaNodeInstanceTypeLower'), 'pls_v')), contains(variables('mediaNodeInstanceTypeLower'), 'pds_v')), contains(variables('mediaNodeInstanceTypeLower'), 'plds_v')), contains(variables('mediaNodeInstanceTypeLower'), 'psv')), contains(variables('mediaNodeInstanceTypeLower'), 'plsv')), contains(variables('mediaNodeInstanceTypeLower'), 'pdsv')), contains(variables('mediaNodeInstanceTypeLower'), 'pldsv'))]",
|
"isMediaArm64": "[or(or(or(or(or(or(or(contains(variables('mediaNodeInstanceTypeLower'), 'ps_v'), contains(variables('mediaNodeInstanceTypeLower'), 'pls_v')), contains(variables('mediaNodeInstanceTypeLower'), 'pds_v')), contains(variables('mediaNodeInstanceTypeLower'), 'plds_v')), contains(variables('mediaNodeInstanceTypeLower'), 'psv')), contains(variables('mediaNodeInstanceTypeLower'), 'plsv')), contains(variables('mediaNodeInstanceTypeLower'), 'pdsv')), contains(variables('mediaNodeInstanceTypeLower'), 'pldsv'))]",
|
||||||
"masterUbuntuSku": "[if(variables('isMasterArm64'), '24_04-lts-arm64', '24_04-lts-gen2')]",
|
"masterUbuntuSku": "[if(variables('isMasterArm64'), 'server-arm64', 'server')]",
|
||||||
"mediaUbuntuSku": "[if(variables('isMediaArm64'), '24_04-lts-arm64', '24_04-lts-gen2')]",
|
"mediaUbuntuSku": "[if(variables('isMediaArm64'), 'server-arm64', 'server')]",
|
||||||
"masterNodeVMSettings": {
|
"masterNodeVMSettings": {
|
||||||
"osDiskType": "StandardSSD_LRS",
|
"osDiskType": "StandardSSD_LRS",
|
||||||
"osDiskSize": "[parameters('masterNodesDiskSize')]",
|
"osDiskSize": "[parameters('masterNodesDiskSize')]",
|
||||||
"ubuntuOSVersion": {
|
"ubuntuOSVersion": {
|
||||||
"publisher": "Canonical",
|
"publisher": "Canonical",
|
||||||
"offer": "0001-com-ubuntu-server-noble",
|
"offer": "ubuntu-24_04-lts",
|
||||||
"sku": "[variables('masterUbuntuSku')]",
|
"sku": "[variables('masterUbuntuSku')]",
|
||||||
"version": "latest"
|
"version": "latest"
|
||||||
},
|
},
|
||||||
|
|
@ -239,7 +239,7 @@
|
||||||
"osDiskType": "StandardSSD_LRS",
|
"osDiskType": "StandardSSD_LRS",
|
||||||
"ubuntuOSVersion": {
|
"ubuntuOSVersion": {
|
||||||
"publisher": "Canonical",
|
"publisher": "Canonical",
|
||||||
"offer": "0001-com-ubuntu-server-noble",
|
"offer": "ubuntu-24_04-lts",
|
||||||
"sku": "[variables('mediaUbuntuSku')]",
|
"sku": "[variables('mediaUbuntuSku')]",
|
||||||
"version": "latest"
|
"version": "latest"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,7 @@ var isEmptyDomain = domainName == ''
|
||||||
var instanceTypeLower = toLower(instanceType)
|
var instanceTypeLower = toLower(instanceType)
|
||||||
var isArm64Instance = contains(instanceTypeLower, 'ps_v') || contains(instanceTypeLower, 'pls_v') || contains(instanceTypeLower, 'pds_v') || contains(instanceTypeLower, 'plds_v') || contains(instanceTypeLower, 'psv') || contains(instanceTypeLower, 'plsv') || contains(instanceTypeLower, 'pdsv') || contains(instanceTypeLower, 'pldsv')
|
var isArm64Instance = contains(instanceTypeLower, 'ps_v') || contains(instanceTypeLower, 'pls_v') || contains(instanceTypeLower, 'pds_v') || contains(instanceTypeLower, 'plds_v') || contains(instanceTypeLower, 'psv') || contains(instanceTypeLower, 'plsv') || contains(instanceTypeLower, 'pdsv') || contains(instanceTypeLower, 'pldsv')
|
||||||
|
|
||||||
var ubuntuSku = isArm64Instance ? '24_04-lts-arm64' : '24_04-lts-gen2'
|
var ubuntuSku = isArm64Instance ? 'server-arm64' : 'server'
|
||||||
|
|
||||||
//Variables for deployment
|
//Variables for deployment
|
||||||
var networkSettings = {
|
var networkSettings = {
|
||||||
|
|
@ -98,7 +98,7 @@ var openviduVMSettings = {
|
||||||
osDiskType: 'StandardSSD_LRS'
|
osDiskType: 'StandardSSD_LRS'
|
||||||
ubuntuOSVersion: {
|
ubuntuOSVersion: {
|
||||||
publisher: 'Canonical'
|
publisher: 'Canonical'
|
||||||
offer: '0001-com-ubuntu-server-noble'
|
offer: 'ubuntu-24_04-lts'
|
||||||
sku: ubuntuSku
|
sku: ubuntuSku
|
||||||
version: 'latest'
|
version: 'latest'
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
"_generator": {
|
"_generator": {
|
||||||
"name": "bicep",
|
"name": "bicep",
|
||||||
"version": "0.37.4.10188",
|
"version": "0.37.4.10188",
|
||||||
"templateHash": "14237993136432487485"
|
"templateHash": "13834895375627415098"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"parameters": {
|
"parameters": {
|
||||||
|
|
@ -149,7 +149,7 @@
|
||||||
"isEmptyDomain": "[equals(parameters('domainName'), '')]",
|
"isEmptyDomain": "[equals(parameters('domainName'), '')]",
|
||||||
"instanceTypeLower": "[toLower(parameters('instanceType'))]",
|
"instanceTypeLower": "[toLower(parameters('instanceType'))]",
|
||||||
"isArm64Instance": "[or(or(or(or(or(or(or(contains(variables('instanceTypeLower'), 'ps_v'), contains(variables('instanceTypeLower'), 'pls_v')), contains(variables('instanceTypeLower'), 'pds_v')), contains(variables('instanceTypeLower'), 'plds_v')), contains(variables('instanceTypeLower'), 'psv')), contains(variables('instanceTypeLower'), 'plsv')), contains(variables('instanceTypeLower'), 'pdsv')), contains(variables('instanceTypeLower'), 'pldsv'))]",
|
"isArm64Instance": "[or(or(or(or(or(or(or(contains(variables('instanceTypeLower'), 'ps_v'), contains(variables('instanceTypeLower'), 'pls_v')), contains(variables('instanceTypeLower'), 'pds_v')), contains(variables('instanceTypeLower'), 'plds_v')), contains(variables('instanceTypeLower'), 'psv')), contains(variables('instanceTypeLower'), 'plsv')), contains(variables('instanceTypeLower'), 'pdsv')), contains(variables('instanceTypeLower'), 'pldsv'))]",
|
||||||
"ubuntuSku": "[if(variables('isArm64Instance'), '24_04-lts-arm64', '24_04-lts-gen2')]",
|
"ubuntuSku": "[if(variables('isArm64Instance'), 'server-arm64', 'server')]",
|
||||||
"networkSettings": {
|
"networkSettings": {
|
||||||
"privateIPaddressNetInterface": "10.0.0.5",
|
"privateIPaddressNetInterface": "10.0.0.5",
|
||||||
"vNetAddressPrefix": "10.0.0.0/16",
|
"vNetAddressPrefix": "10.0.0.0/16",
|
||||||
|
|
@ -163,7 +163,7 @@
|
||||||
"osDiskType": "StandardSSD_LRS",
|
"osDiskType": "StandardSSD_LRS",
|
||||||
"ubuntuOSVersion": {
|
"ubuntuOSVersion": {
|
||||||
"publisher": "Canonical",
|
"publisher": "Canonical",
|
||||||
"offer": "0001-com-ubuntu-server-noble",
|
"offer": "ubuntu-24_04-lts",
|
||||||
"sku": "[variables('ubuntuSku')]",
|
"sku": "[variables('ubuntuSku')]",
|
||||||
"version": "latest"
|
"version": "latest"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue