Skip to content

update #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmauser merged 1 commit into from
Mar 12, 2026
Merged

update #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/bicepBuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: CheckGitHubEvent
shell: pwsh
Expand Down
26 changes: 10 additions & 16 deletions bicep/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,13 +410,12 @@ module opnSenseSecondary 'modules/VM/opnsense.bicep' = if(scenarioOption == 'Act
virtualMachineName: VMOPNsenseSecondaryName
virtualMachineSize: virtualMachineSize
nsgId: nsgopnsense.outputs.nsgID
ExternalLoadBalancerBackendAddressPoolId: scenarioOption == 'Active-Active' ? elb.outputs.backendAddressPools[0].id : ''
InternalLoadBalancerBackendAddressPoolId: scenarioOption == 'Active-Active' ? ilb.outputs.backendAddressPools[0].id : ''
ExternalloadBalancerInboundNatRulesId: scenarioOption == 'Active-Active' ? elb.outputs.inboundNatRules[1].id : ''
ExternalLoadBalancerBackendAddressPoolId: scenarioOption == 'Active-Active' ? any(elb).outputs.backendAddressPools[0].id : ''
InternalLoadBalancerBackendAddressPoolId: scenarioOption == 'Active-Active' ? any(ilb).outputs.backendAddressPools[0].id : ''
ExternalloadBalancerInboundNatRulesId: scenarioOption == 'Active-Active' ? any(elb).outputs.inboundNatRules[1].id : ''
}
dependsOn: [
vnet
nsgopnsense
untrustedSubnet
trustedSubnet
windowsvmsubnet
Expand All @@ -437,7 +436,7 @@ module opnSensePrimary 'modules/VM/opnsense.bicep' = if(scenarioOption == 'Activ
TrustedSubnetName: '${virtualNetworkName}/${useexistingvirtualNetwork ? existingTrustedSubnetName : trustedSubnetName}'
WindowsSubnetName: DeployWindows ? '${virtualNetworkName}/${useexistingvirtualNetwork ? existingWindowsSubnet : windowsvmsubnetname}' : ''
publicIPAddress: publicip.outputs.publicipAddress
opnSenseSecondarytrustedNicIP: scenarioOption == 'Active-Active' ? opnSenseSecondary.outputs.trustedNicIP : ''
opnSenseSecondarytrustedNicIP: scenarioOption == 'Active-Active' ? any(opnSenseSecondary).outputs.trustedNicIP : ''
}
OPNScriptURI: OpnScriptURI
ShellScriptName: ShellScriptName
Expand All @@ -449,14 +448,12 @@ module opnSensePrimary 'modules/VM/opnsense.bicep' = if(scenarioOption == 'Activ
virtualMachineName: VMOPNsensePrimaryName
virtualMachineSize: virtualMachineSize
nsgId: nsgopnsense.outputs.nsgID
ExternalLoadBalancerBackendAddressPoolId: scenarioOption == 'Active-Active' ? elb.outputs.backendAddressPools[0].id : ''
InternalLoadBalancerBackendAddressPoolId: scenarioOption == 'Active-Active' ? ilb.outputs.backendAddressPools[0].id : ''
ExternalloadBalancerInboundNatRulesId: scenarioOption == 'Active-Active' ? elb.outputs.inboundNatRules[0].id : ''
ExternalLoadBalancerBackendAddressPoolId: scenarioOption == 'Active-Active' ? any(elb).outputs.backendAddressPools[0].id : ''
InternalLoadBalancerBackendAddressPoolId: scenarioOption == 'Active-Active' ? any(ilb).outputs.backendAddressPools[0].id : ''
ExternalloadBalancerInboundNatRulesId: scenarioOption == 'Active-Active' ? any(elb).outputs.inboundNatRules[0].id : ''
}
dependsOn: [
vnet
nsgopnsense
opnSenseSecondary
]
}

Expand Down Expand Up @@ -490,7 +487,6 @@ module opnSenseTwoNics 'modules/VM/opnsense.bicep' = if(scenarioOption == 'TwoNi
}
dependsOn: [
vnet
nsgopnsense
trustedSubnet
]
}
Expand Down Expand Up @@ -577,7 +573,7 @@ module winvmroutetableroutes 'modules/vnet/routetableroutes.bicep' = if (DeployW
routeName: 'default'
properties: {
nextHopType: 'VirtualAppliance'
nextHopIpAddress: scenarioOption == 'Active-Active' ? ilb.outputs.frontendIP.privateIPAddress : scenarioOption == 'TwoNics' ? opnSenseTwoNics.outputs.trustedNicIP : ''
nextHopIpAddress: scenarioOption == 'Active-Active' ? any(ilb).outputs.frontendIP.privateIPAddress : scenarioOption == 'TwoNics' ? any(opnSenseTwoNics).outputs.trustedNicIP : ''
addressPrefix: '0.0.0.0/0'
}
}
Expand All @@ -590,17 +586,15 @@ module winvm 'modules/VM/windows11-vm.bicep' = if (DeployWindows) {
name: winvmName
params: {
Location: Location
nsgId: DeployWindows ? nsgwinvm.outputs.nsgID : ''
publicIPId: DeployWindows ? winvmpublicip.outputs.publicipId : ''
nsgId: DeployWindows ? any(nsgwinvm).outputs.nsgID : ''
publicIPId: DeployWindows ? any(winvmpublicip).outputs.publicipId : ''
TempUsername: WinUsername
TempPassword: WinPassword
trustedSubnetId: windowsvmsubnet.id
virtualMachineName: winvmName
virtualMachineSize: 'Standard_B4ms'
}
dependsOn: [
nsgwinvm
winvmpublicip
opnSenseSecondary
opnSensePrimary
opnSenseTwoNics
Expand Down
Loading