From 57f1c215c518a02b129aa9a4f877c61be70449fe Mon Sep 17 00:00:00 2001 From: Daniel Mauser Date: Wed, 11 Mar 2026 21:05:51 -0500 Subject: [PATCH 1/3] Update uiFormDefinition.json --- bicep/uiFormDefinition.json | 79 ++++++++++++++++++++++++++++++++----- 1 file changed, 70 insertions(+), 9 deletions(-) diff --git a/bicep/uiFormDefinition.json b/bicep/uiFormDefinition.json index 46438d1..39d3668 100644 --- a/bicep/uiFormDefinition.json +++ b/bicep/uiFormDefinition.json @@ -163,6 +163,67 @@ "name": "VirtualNetworkConfig", "label": "Virtual Network Settings", "elements": [ + { + "name": "vnetNewOrExisting", + "type": "Microsoft.Common.OptionsGroup", + "label": "Virtual Network", + "defaultValue": "new", + "toolTip": "Select whether to create a new Virtual Network or use an existing one.", + "constraints": { + "allowedValues": [ + { + "label": "Create new Virtual Network", + "value": "new" + }, + { + "label": "Use existing Virtual Network", + "value": "existing" + } + ] + } + }, + { + "name": "existingVnetName", + "type": "Microsoft.Common.TextBox", + "label": "Existing Virtual Network Name", + "toolTip": "Name of the existing Virtual Network to deploy into.", + "defaultValue": "OPN-VNET", + "visible": "[equals(steps('VirtualNetworkConfig').vnetNewOrExisting, 'existing')]", + "constraints": { + "required": true + } + }, + { + "name": "existingUntrustedSubnetNameInput", + "type": "Microsoft.Common.TextBox", + "label": "Existing Untrusted Subnet Name", + "toolTip": "Name of the existing Untrusted (WAN-facing) subnet in the Virtual Network.", + "defaultValue": "Untrusted-Subnet", + "visible": "[equals(steps('VirtualNetworkConfig').vnetNewOrExisting, 'existing')]", + "constraints": { + "required": true + } + }, + { + "name": "existingTrustedSubnetNameInput", + "type": "Microsoft.Common.TextBox", + "label": "Existing Trusted Subnet Name", + "toolTip": "Name of the existing Trusted (LAN-facing) subnet in the Virtual Network.", + "defaultValue": "Trusted-Subnet", + "visible": "[equals(steps('VirtualNetworkConfig').vnetNewOrExisting, 'existing')]", + "constraints": { + "required": true + } + }, + { + "name": "existingWindowsSubnetInput", + "type": "Microsoft.Common.TextBox", + "label": "Existing Windows Management Subnet Name", + "toolTip": "Name of the existing Windows Management subnet in the Virtual Network.", + "defaultValue": "Windows-VM-Subnet", + "visible": "[and(equals(steps('VirtualNetworkConfig').vnetNewOrExisting, 'existing'), steps('VirtualMachineConfig').DeployWindows)]", + "constraints": {} + }, { "name": "vnetActiveActiveWindows", "type": "Microsoft.Network.VirtualNetworkCombo", @@ -216,7 +277,7 @@ } } }, - "visible": "[and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows)]" + "visible": "[and(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'new'))]" }, { "name": "vnetActiveActivenoWindows", @@ -261,7 +322,7 @@ } } }, - "visible": "[and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows))]" + "visible": "[and(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'new'))]" }, { "name": "vnetTwoNicsWindows", @@ -316,7 +377,7 @@ } } }, - "visible": "[and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows)]" + "visible": "[and(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'new'))]" }, { "name": "vnetTwoNicsnoWindows", @@ -361,7 +422,7 @@ } } }, - "visible": "[and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),not(steps('VirtualMachineConfig').DeployWindows))]" + "visible": "[and(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),not(steps('VirtualMachineConfig').DeployWindows)),equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'new'))]" } ] } @@ -373,12 +434,12 @@ "scenarioOption": "[steps('OPNSenseScenario').scenarioOption]", "virtualMachineSize": "[steps('VirtualMachineConfig').vmSize]", "virtualMachineName": "[steps('VirtualMachineConfig').vmName]", - "existingvirtualNetwork": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.newOrExisting,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.newOrExisting,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.newOrExisting,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.newOrExisting)))]", + "existingvirtualNetwork": "[steps('VirtualNetworkConfig').vnetNewOrExisting]", "VNETAddress": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.addressPrefixes,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.addressPrefixes,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.addressPrefixes,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.addressPrefixes)))]", "UntrustedSubnetCIDR": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Untrusted-Subnet.addressPrefix,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.subnets.Untrusted-Subnet.addressPrefix,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Untrusted-Subnet.addressPrefix,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.subnets.Untrusted-Subnet.addressPrefix)))]", "TrustedSubnetCIDR": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Trusted-Subnet.addressPrefix,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.subnets.Trusted-Subnet.addressPrefix,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Trusted-Subnet.addressPrefix,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.subnets.Trusted-Subnet.addressPrefix)))]", - "existingUntrustedSubnetName": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Untrusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.subnets.Untrusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Untrusted-Subnet.name,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.subnets.Untrusted-Subnet.name)))]", - "existingTrustedSubnetName": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Trusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.subnets.Trusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Trusted-Subnet.name,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.subnets.Trusted-Subnet.name)))]", + "existingUntrustedSubnetName": "[if(equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'existing'),steps('VirtualNetworkConfig').existingUntrustedSubnetNameInput,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Untrusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.subnets.Untrusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Untrusted-Subnet.name,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.subnets.Untrusted-Subnet.name)))]", + "existingTrustedSubnetName": "[if(equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'existing'),steps('VirtualNetworkConfig').existingTrustedSubnetNameInput,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Trusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.subnets.Trusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Trusted-Subnet.name,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.subnets.Trusted-Subnet.name)))]", "OpnScriptURI": "[steps('VirtualMachineConfig').OpnScriptURI]", "ShellScriptName": "[steps('VirtualMachineConfig').ShellScriptName]", "OpnVersion": "[steps('VirtualMachineConfig').OpnVersion]", @@ -386,10 +447,10 @@ "DeployWindows": "[steps('VirtualMachineConfig').DeployWindows]", "WinUsername": "[steps('VirtualMachineConfig').WinUsername]", "WinPassword": "[steps('VirtualMachineConfig').WinPassword]", - "existingWindowsSubnet": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Windows-Subnet.name,steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Windows-Subnet.name)]", + "existingWindowsSubnet": "[if(equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'existing'),steps('VirtualNetworkConfig').existingWindowsSubnetInput,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Windows-Subnet.name,steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Windows-Subnet.name))]", "DeployWindowsSubnet": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Windows-Subnet.addressPrefix,steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Windows-Subnet.addressPrefix)]", "Location": "[steps('OPNSenseScenario').resourceScope.location.name]", - "virtualNetworkName": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.name,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.name)))]" + "virtualNetworkName": "[if(equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'existing'),steps('VirtualNetworkConfig').existingVnetName,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.name,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.name))))]" }, "kind": "ResourceGroup", "location": "[steps('OPNSenseScenario').resourceScope.location.name]", From 00c80598f0d666ecd9c8b43b66e659467c97f9de Mon Sep 17 00:00:00 2001 From: Daniel Mauser Date: Wed, 11 Mar 2026 21:27:47 -0500 Subject: [PATCH 2/3] march improvements updated to 26.1 and latest Azure VM agent also fixed existing vnet issue. --- ARM/main.json | 4 ++-- README.md | 6 ++++++ bicep/main.bicep | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ARM/main.json b/ARM/main.json index 59908cf..41b0aea 100644 --- a/ARM/main.json +++ b/ARM/main.json @@ -111,14 +111,14 @@ }, "OpnVersion": { "type": "string", - "defaultValue": "25.1", + "defaultValue": "26.1", "metadata": { "description": "OPN Version" } }, "WALinuxVersion": { "type": "string", - "defaultValue": "2.12.0.4", + "defaultValue": "2.15.0.1", "metadata": { "description": "Azure WALinux agent Version" } diff --git a/README.md b/README.md index cb222e0..819192e 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,12 @@ In case of Active-Active the URL should be for Primary ## Updates +## March-2026 + +- OPNSense 26.1 as default version. +- Azure Linux Agent updated to 2.15.0.1. +- Fixed issue [#69](https://github.com/dmauser/opnazure/issues/69): Cannot select existing VNet in the deployment wizard. + ## March-2025 - OPNSense 25.1 as default version diff --git a/bicep/main.bicep b/bicep/main.bicep index 2511cca..a0368a2 100644 --- a/bicep/main.bicep +++ b/bicep/main.bicep @@ -49,10 +49,10 @@ param OpnScriptURI string = 'https://raw.githubusercontent.com/dmauser/opnazure/ param ShellScriptName string = 'configureopnsense.sh' @sys.description('OPN Version') -param OpnVersion string = '25.1' +param OpnVersion string = '26.1' @sys.description('Azure WALinux agent Version') -param WALinuxVersion string = '2.12.0.4' +param WALinuxVersion string = '2.15.0.1' @sys.description('Deploy Windows VM Trusted Subnet') param DeployWindows bool = false From 8cb82be4f8632cb0f54dea6b05be7f2bbd3deb72 Mon Sep 17 00:00:00 2001 From: Daniel Mauser Date: Wed, 11 Mar 2026 22:46:39 -0500 Subject: [PATCH 3/3] Update uiFormDefinition.json --- bicep/uiFormDefinition.json | 79 +++++-------------------------------- 1 file changed, 9 insertions(+), 70 deletions(-) diff --git a/bicep/uiFormDefinition.json b/bicep/uiFormDefinition.json index 39d3668..46438d1 100644 --- a/bicep/uiFormDefinition.json +++ b/bicep/uiFormDefinition.json @@ -163,67 +163,6 @@ "name": "VirtualNetworkConfig", "label": "Virtual Network Settings", "elements": [ - { - "name": "vnetNewOrExisting", - "type": "Microsoft.Common.OptionsGroup", - "label": "Virtual Network", - "defaultValue": "new", - "toolTip": "Select whether to create a new Virtual Network or use an existing one.", - "constraints": { - "allowedValues": [ - { - "label": "Create new Virtual Network", - "value": "new" - }, - { - "label": "Use existing Virtual Network", - "value": "existing" - } - ] - } - }, - { - "name": "existingVnetName", - "type": "Microsoft.Common.TextBox", - "label": "Existing Virtual Network Name", - "toolTip": "Name of the existing Virtual Network to deploy into.", - "defaultValue": "OPN-VNET", - "visible": "[equals(steps('VirtualNetworkConfig').vnetNewOrExisting, 'existing')]", - "constraints": { - "required": true - } - }, - { - "name": "existingUntrustedSubnetNameInput", - "type": "Microsoft.Common.TextBox", - "label": "Existing Untrusted Subnet Name", - "toolTip": "Name of the existing Untrusted (WAN-facing) subnet in the Virtual Network.", - "defaultValue": "Untrusted-Subnet", - "visible": "[equals(steps('VirtualNetworkConfig').vnetNewOrExisting, 'existing')]", - "constraints": { - "required": true - } - }, - { - "name": "existingTrustedSubnetNameInput", - "type": "Microsoft.Common.TextBox", - "label": "Existing Trusted Subnet Name", - "toolTip": "Name of the existing Trusted (LAN-facing) subnet in the Virtual Network.", - "defaultValue": "Trusted-Subnet", - "visible": "[equals(steps('VirtualNetworkConfig').vnetNewOrExisting, 'existing')]", - "constraints": { - "required": true - } - }, - { - "name": "existingWindowsSubnetInput", - "type": "Microsoft.Common.TextBox", - "label": "Existing Windows Management Subnet Name", - "toolTip": "Name of the existing Windows Management subnet in the Virtual Network.", - "defaultValue": "Windows-VM-Subnet", - "visible": "[and(equals(steps('VirtualNetworkConfig').vnetNewOrExisting, 'existing'), steps('VirtualMachineConfig').DeployWindows)]", - "constraints": {} - }, { "name": "vnetActiveActiveWindows", "type": "Microsoft.Network.VirtualNetworkCombo", @@ -277,7 +216,7 @@ } } }, - "visible": "[and(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'new'))]" + "visible": "[and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows)]" }, { "name": "vnetActiveActivenoWindows", @@ -322,7 +261,7 @@ } } }, - "visible": "[and(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'new'))]" + "visible": "[and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows))]" }, { "name": "vnetTwoNicsWindows", @@ -377,7 +316,7 @@ } } }, - "visible": "[and(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'new'))]" + "visible": "[and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows)]" }, { "name": "vnetTwoNicsnoWindows", @@ -422,7 +361,7 @@ } } }, - "visible": "[and(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),not(steps('VirtualMachineConfig').DeployWindows)),equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'new'))]" + "visible": "[and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),not(steps('VirtualMachineConfig').DeployWindows))]" } ] } @@ -434,12 +373,12 @@ "scenarioOption": "[steps('OPNSenseScenario').scenarioOption]", "virtualMachineSize": "[steps('VirtualMachineConfig').vmSize]", "virtualMachineName": "[steps('VirtualMachineConfig').vmName]", - "existingvirtualNetwork": "[steps('VirtualNetworkConfig').vnetNewOrExisting]", + "existingvirtualNetwork": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.newOrExisting,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.newOrExisting,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.newOrExisting,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.newOrExisting)))]", "VNETAddress": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.addressPrefixes,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.addressPrefixes,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.addressPrefixes,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.addressPrefixes)))]", "UntrustedSubnetCIDR": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Untrusted-Subnet.addressPrefix,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.subnets.Untrusted-Subnet.addressPrefix,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Untrusted-Subnet.addressPrefix,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.subnets.Untrusted-Subnet.addressPrefix)))]", "TrustedSubnetCIDR": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Trusted-Subnet.addressPrefix,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.subnets.Trusted-Subnet.addressPrefix,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Trusted-Subnet.addressPrefix,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.subnets.Trusted-Subnet.addressPrefix)))]", - "existingUntrustedSubnetName": "[if(equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'existing'),steps('VirtualNetworkConfig').existingUntrustedSubnetNameInput,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Untrusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.subnets.Untrusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Untrusted-Subnet.name,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.subnets.Untrusted-Subnet.name)))]", - "existingTrustedSubnetName": "[if(equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'existing'),steps('VirtualNetworkConfig').existingTrustedSubnetNameInput,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Trusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.subnets.Trusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Trusted-Subnet.name,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.subnets.Trusted-Subnet.name)))]", + "existingUntrustedSubnetName": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Untrusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.subnets.Untrusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Untrusted-Subnet.name,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.subnets.Untrusted-Subnet.name)))]", + "existingTrustedSubnetName": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Trusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.subnets.Trusted-Subnet.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Trusted-Subnet.name,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.subnets.Trusted-Subnet.name)))]", "OpnScriptURI": "[steps('VirtualMachineConfig').OpnScriptURI]", "ShellScriptName": "[steps('VirtualMachineConfig').ShellScriptName]", "OpnVersion": "[steps('VirtualMachineConfig').OpnVersion]", @@ -447,10 +386,10 @@ "DeployWindows": "[steps('VirtualMachineConfig').DeployWindows]", "WinUsername": "[steps('VirtualMachineConfig').WinUsername]", "WinPassword": "[steps('VirtualMachineConfig').WinPassword]", - "existingWindowsSubnet": "[if(equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'existing'),steps('VirtualNetworkConfig').existingWindowsSubnetInput,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Windows-Subnet.name,steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Windows-Subnet.name))]", + "existingWindowsSubnet": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Windows-Subnet.name,steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Windows-Subnet.name)]", "DeployWindowsSubnet": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.subnets.Windows-Subnet.addressPrefix,steps('VirtualNetworkConfig').vnetTwoNicsWindows.subnets.Windows-Subnet.addressPrefix)]", "Location": "[steps('OPNSenseScenario').resourceScope.location.name]", - "virtualNetworkName": "[if(equals(steps('VirtualNetworkConfig').vnetNewOrExisting,'existing'),steps('VirtualNetworkConfig').existingVnetName,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.name,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.name))))]" + "virtualNetworkName": "[if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetActiveActiveWindows.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'Active-Active'),not(steps('VirtualMachineConfig').DeployWindows)),steps('VirtualNetworkConfig').vnetActiveActivenoWindows.name,if(and(equals(steps('OPNSenseScenario').scenarioOption,'TwoNics'),steps('VirtualMachineConfig').DeployWindows),steps('VirtualNetworkConfig').vnetTwoNicsWindows.name,steps('VirtualNetworkConfig').vnetTwoNicsnoWindows.name)))]" }, "kind": "ResourceGroup", "location": "[steps('OPNSenseScenario').resourceScope.location.name]",