From b7e715361e008cbd7a951e80a23e0eac8562ecf0 Mon Sep 17 00:00:00 2001 From: Piwccle Date: Wed, 15 Oct 2025 18:45:25 +0200 Subject: [PATCH] openvidu-deployment: azure - changed "defaultName" of PublicIpAddress and changed Action Group name --- .../pro/elastic/azure/cf-openvidu-elastic.bicep | 12 +++++++----- .../pro/elastic/azure/createUiDefinition.json | 2 +- .../pro/ha/azure/cf-openvidu-ha.bicep | 16 ++++++++-------- .../pro/ha/azure/createUiDefinition.json | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/openvidu-deployment/pro/elastic/azure/cf-openvidu-elastic.bicep b/openvidu-deployment/pro/elastic/azure/cf-openvidu-elastic.bicep index fefc7882d..54ef1dbba 100644 --- a/openvidu-deployment/pro/elastic/azure/cf-openvidu-elastic.bicep +++ b/openvidu-deployment/pro/elastic/azure/cf-openvidu-elastic.bicep @@ -945,7 +945,7 @@ var after_installScriptMaster = reduce( var get_public_ip_script = reduce( items(stringInterpolationParamsMaster), - { value: get_public_ip}, + { value: get_public_ip }, (curr, next) => { value: replace(curr.value, '\${${next.key}}', next.value) } ).value @@ -1530,7 +1530,7 @@ module webhookModule '../../shared/webhookdeployment.json' = { } resource actionGroupScaleIn 'Microsoft.Insights/actionGroups@2023-01-01' = { - name: 'actiongrouptest' + name: 'actiongroupScaleIn' location: 'global' properties: { groupShortName: 'scaleinag' @@ -1675,9 +1675,11 @@ resource netInterfaceMasterNode 'Microsoft.Network/networkInterfaces@2023-11-01' id: openviduMasterNodeASG.id } ] - publicIPAddress: isEmptyIp ? null : { - id: ipNew ? publicIP_OV_ifNew.id : publicIP_OV_ifExisting.id - } + publicIPAddress: isEmptyIp + ? null + : { + id: ipNew ? publicIP_OV_ifNew.id : publicIP_OV_ifExisting.id + } } } ] diff --git a/openvidu-deployment/pro/elastic/azure/createUiDefinition.json b/openvidu-deployment/pro/elastic/azure/createUiDefinition.json index 24a152392..b92643265 100644 --- a/openvidu-deployment/pro/elastic/azure/createUiDefinition.json +++ b/openvidu-deployment/pro/elastic/azure/createUiDefinition.json @@ -80,7 +80,7 @@ "publicIpAddress": "Previously created Public IP address for the OpenVidu Deployment. Blank will generate a public IP" }, "defaultValue": { - "publicIpAddressName": "defaultName" + "publicIpAddressName": "ov-publicIpAddress" }, "options": { "hideNone": true, diff --git a/openvidu-deployment/pro/ha/azure/cf-openvidu-ha.bicep b/openvidu-deployment/pro/ha/azure/cf-openvidu-ha.bicep index cd8a4913a..6441374bc 100644 --- a/openvidu-deployment/pro/ha/azure/cf-openvidu-ha.bicep +++ b/openvidu-deployment/pro/ha/azure/cf-openvidu-ha.bicep @@ -22,8 +22,6 @@ param ownPublicCertificate string = '' @description('If certificate type is \'owncert\', this parameter will be used to specify the private certificate') param ownPrivateCertificate string = '' - - @description('Name of the PublicIPAddress resource in Azure when using certificateType \'owncert\' or \'letsencrypt\'') param publicIpAddressObject object @@ -1099,7 +1097,7 @@ var update_config_from_secretScriptMaster = reduce( var get_public_ip_script = reduce( items(stringInterpolationParamsMaster1), - { value: get_public_ip}, + { value: get_public_ip }, (curr, next) => { value: replace(curr.value, '\${${next.key}}', next.value) } ).value @@ -1899,7 +1897,7 @@ module webhookModule '../../shared/webhookdeployment.json' = { } resource actionGroupScaleIn 'Microsoft.Insights/actionGroups@2023-01-01' = { - name: 'actiongrouptest' + name: 'actiongroupScaleIn' location: 'global' properties: { groupShortName: 'scaleinag' @@ -1972,7 +1970,7 @@ var lbBackendPoolNameMasterNode = 'LoadBalancerBackEndMasterNode' var ipExists = publicIpAddressObject.newOrExistingOrNone == 'existing' -resource publicIP_OV_ifExisting'Microsoft.Network/publicIPAddresses@2023-11-01' existing = if (ipExists == true) { +resource publicIP_OV_ifExisting 'Microsoft.Network/publicIPAddresses@2023-11-01' existing = if (ipExists == true) { name: publicIpAddressObject.name } @@ -2007,9 +2005,11 @@ resource LoadBalancer 'Microsoft.Network/loadBalancers@2024-05-01' = { { name: lbFrontEndName properties: { - publicIPAddress: isEmptyIp ? null : { - id: ipNew ? publicIP_OV_ifNew.id : publicIP_OV_ifExisting.id - } + publicIPAddress: isEmptyIp + ? null + : { + id: ipNew ? publicIP_OV_ifNew.id : publicIP_OV_ifExisting.id + } } } ] diff --git a/openvidu-deployment/pro/ha/azure/createUiDefinition.json b/openvidu-deployment/pro/ha/azure/createUiDefinition.json index 634a74979..5eb85d2b8 100644 --- a/openvidu-deployment/pro/ha/azure/createUiDefinition.json +++ b/openvidu-deployment/pro/ha/azure/createUiDefinition.json @@ -80,7 +80,7 @@ "publicIpAddress": "Previously created Public IP address for the OpenVidu Deployment. Blank will generate a public IP" }, "defaultValue": { - "publicIpAddressName": "defaultName" + "publicIpAddressName": "ov-publicIpAddress" }, "options": { "hideNone": true,