Skip to content

Commit 05f2ab0

Browse files
PowerShellCrackPowerShellCrack
committed
updated vyos output for variables
1 parent b0f4bde commit 05f2ab0

5 files changed

+27
-33
lines changed

‎Step 2. Setup Vyos Router in Lab.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ foreach ($SubnetCIDR in $VyOSConfig.LocalSubnetPrefix.GetEnumerator() | Sort Nam
272272
`n
273273
#Interface $i Configuration
274274
set interfaces ethernet eth$i address $($IPInfo.EndingIP)/$($IPInfo.Prefix)
275-
set interfaces ethernet eth$i description '$Description'
276-
set service dns forwarding listen-on 'eth$i'
275+
set interfaces ethernet eth$i description '$($Description)'
276+
set service dns forwarding listen-on 'eth$($i)'
277277
"@
278278

279279
If($VyOSConfig.EnableDHCP){
@@ -305,11 +305,11 @@ set service dns forwarding dhcp eth0
305305
'Internal' {$VyOSLanCmd += @"
306306
`n
307307
#Set internal dns
308-
309308
"@
310309
foreach ($IP in $VyOSConfig.InternalDNSIP){
311310
$VyOSLanCmd += @"
312-
set service dns forwarding name-server '$IP'
311+
`n
312+
set service dns forwarding name-server '$($IP)'
313313
"@
314314
}
315315
}
@@ -318,7 +318,7 @@ set service dns forwarding name-server '$IP'
318318
#Set internet dns
319319
`n
320320
set service dns forwarding name-server '8.8.8.8'
321-
set service dns forwarding name-server '$NextHop'
321+
set service dns forwarding name-server '$($NextHop)'
322322
"@
323323
}
324324
}
@@ -328,8 +328,8 @@ If($VyOSConfig.EnablePXERelay){
328328
ForEach($Network in $VyOSNetworks){
329329
$VyOSLanCmd += @"
330330
`n
331-
#Enable DHCP relay (PXE boot) for eth($i):
332-
set service dhcp-relay interface eth$i
331+
#Enable DHCP relay (PXE boot) for eth$($i):
332+
set service dhcp-relay interface eth$($i)
333333
"@
334334
$i=$i+1
335335
}

‎Step 3A. Build Azure Basic S2S.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ set vpn ipsec site-to-site peer $($azpip.IpAddress) default-esp-group 'azure'
334334
set vpn ipsec site-to-site peer $($azpip.IpAddress) description '$($AzureSimpleConfig.TunnelDescription)'
335335
set vpn ipsec site-to-site peer $($azpip.IpAddress) ike-group 'azure-ike'
336336
set vpn ipsec site-to-site peer $($azpip.IpAddress) ikev2-reauth 'inherit'
337-
set vpn ipsec site-to-site peer $($azpip.IpAddress) local-address '$VyOSExternalIP'
337+
set vpn ipsec site-to-site peer $($azpip.IpAddress) local-address '$($VyOSExternalIP)'
338338
set vpn ipsec site-to-site peer $($azpip.IpAddress) tunnel 1 allow-nat-networks 'disable'
339339
set vpn ipsec site-to-site peer $($azpip.IpAddress) tunnel 1 allow-public-networks 'disable'
340340
set vpn ipsec site-to-site peer $($azpip.IpAddress) tunnel 1 local prefix '$($VyOSConfig.LocalCIDRPrefix)'

‎Step 3B-1. Build Azure Advanced S2S - Region 1.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ set vpn ipsec site-to-site peer $($azpip.IpAddress) default-esp-group 'azure'
375375
set vpn ipsec site-to-site peer $($azpip.IpAddress) description '$($AzureAdvConfigSiteA.TunnelDescription)'
376376
set vpn ipsec site-to-site peer $($azpip.IpAddress) ike-group 'azure-ike'
377377
set vpn ipsec site-to-site peer $($azpip.IpAddress) ikev2-reauth 'inherit'
378-
set vpn ipsec site-to-site peer $($azpip.IpAddress) local-address '$VyOSExternalIP'
378+
set vpn ipsec site-to-site peer $($azpip.IpAddress) local-address '$($VyOSExternalIP)'
379379
set vpn ipsec site-to-site peer $($azpip.IpAddress) tunnel 1 allow-nat-networks 'disable'
380380
set vpn ipsec site-to-site peer $($azpip.IpAddress) tunnel 1 allow-public-networks 'disable'
381381
set vpn ipsec site-to-site peer $($azpip.IpAddress) tunnel 1 local prefix '$($VyOSConfig.LocalCIDRPrefix)'

‎Step 3C. Attach Azure S2S to Existing Network.ps1

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Param(
22
[string]$Prefix,
3+
4+
[Parameter(Mandatory = $true)]
35
[ArgumentCompleter( {
46
param ( $commandName,
57
$parameterName,
@@ -18,48 +20,43 @@ Param(
1820
[Alias("rg")]
1921
[string]$ResourceGroup,
2022

23+
[Parameter(Mandatory = $true)]
2124
[ArgumentCompleter( {
2225
param ( $commandName,
2326
$parameterName,
2427
$wordToComplete,
2528
$commandAst,
2629
$fakeBoundParameters )
2730

28-
If($ResourceGroup){
29-
$vNets = Get-AzVirtualNetwork -ResourceGroupName $ResourceGroup | Select -ExpandProperty Name
30-
}Else{
31-
$vNets = Get-AzVirtualNetwork | Select -ExpandProperty Name
32-
}
31+
$vNets = Get-AzVirtualNetwork | Select -ExpandProperty Name
3332

3433
$vNets | Where-Object {
3534
$_ -like "$wordToComplete*"
3635
}
37-
3836
} )]
3937
[Alias("vNet")]
4038
[string]$VirtualNetwork,
4139

40+
[Parameter(Mandatory = $true)]
4241
[ArgumentCompleter( {
4342
param ( $commandName,
4443
$parameterName,
4544
$wordToComplete,
4645
$commandAst,
4746
$fakeBoundParameters )
4847

49-
If($ResourceGroup){
50-
$pNics = (Get-AzNetworkInterface -ResourceGroupName $ResourceGroup).IpConfigurations.PrivateIpAddress
51-
}Else{
52-
$pNics = (Get-AzNetworkInterface).IpConfigurations.PrivateIpAddress
53-
}
48+
$pNics = (Get-AzNetworkInterface).IpConfigurations.PrivateIpAddress
5449

5550
$pNics | Where-Object {
5651
$_ -like "$wordToComplete*"
5752
}
5853

5954
} )]
60-
[Alias("DNS")]
61-
[string]$DNSIP,
55+
[Alias("Dns")]
56+
[string[]]$DnsIp,
57+
6258
[switch]$RemovePublicIps,
59+
6360
[switch]$Force
6461

6562
)
@@ -97,7 +94,7 @@ Try{Start-transcript "$PSScriptRoot\Logs\$LogfileName" -ErrorAction Stop}catch{S
9794
#endregion
9895

9996

100-
$VyOSConfig['InternalDNSIP'] = $DNSIP
97+
$VyOSConfig['InternalDNSIP'] = $DnsIp
10198

10299
$AzureExistingConfig = @{
103100

@@ -546,7 +543,7 @@ delete protocols
546543
"@
547544
}
548545

549-
If($DNSIP){
546+
If($DnsIp){
550547
$VyOSFinal += @"
551548
`n
552549
delete service dns forwarding name-server
@@ -558,7 +555,7 @@ delete service dns forwarding name-server
558555
$VyOSFinal += @"
559556
`n
560557
#Interface $i Configuration
561-
set service dns forwarding listen-on 'eth$i'
558+
set service dns forwarding listen-on 'eth$($i)'
562559
"@
563560

564561
If($VyOSConfig.EnableDHCP){
@@ -568,11 +565,11 @@ set service dns forwarding listen-on 'eth$i'
568565
delete service dhcp-server shared-network-name ETH$($i)_Pool subnet $($SubnetCIDR.Name) dns-server
569566
"@
570567

571-
foreach ($DNS in $DNSIP){
568+
foreach ($DNS in $DnsIp){
572569
If(Test-IPAddress $DNS){
573570
$VyOSFinal += @"
574571
`n
575-
set service dhcp-server shared-network-name ETH$($i)_Pool subnet $($SubnetCIDR.Name) dns-server $DNS
572+
set service dhcp-server shared-network-name ETH$($i)_Pool subnet $($SubnetCIDR.Name) dns-server $($DNS)
576573
"@
577574
}
578575
}#end dns loop
@@ -601,7 +598,7 @@ set service dns forwarding dhcp eth0
601598
"@
602599
foreach ($IP in $VyOSConfig.InternalDNSIP){
603600
$VyOSFinal += @"
604-
set service dns forwarding name-server '$IP'
601+
set service dns forwarding name-server '$($IP)'
605602
"@
606603
}
607604
}#end internal switch option
@@ -612,7 +609,7 @@ set service dns forwarding name-server '$IP'
612609
#Set internet dns
613610
`n
614611
set service dns forwarding name-server '8.8.8.8'
615-
set service dns forwarding name-server '$NextHop'
612+
set service dns forwarding name-server '$($NextHop)'
616613
"@
617614
} #end internet switch option
618615
} #end switch
@@ -643,7 +640,7 @@ set vpn ipsec site-to-site peer $($azpip.IpAddress) default-esp-group 'azure'
643640
set vpn ipsec site-to-site peer $($azpip.IpAddress) description '$($AzureExistingConfig.TunnelDescription)'
644641
set vpn ipsec site-to-site peer $($azpip.IpAddress) ike-group 'azure-ike'
645642
set vpn ipsec site-to-site peer $($azpip.IpAddress) ikev2-reauth 'inherit'
646-
set vpn ipsec site-to-site peer $($azpip.IpAddress) local-address '$VyOSExternalIP'
643+
set vpn ipsec site-to-site peer $($azpip.IpAddress) local-address '$($VyOSExternalIP)'
647644
set vpn ipsec site-to-site peer $($azpip.IpAddress) tunnel 1 allow-nat-networks 'disable'
648645
set vpn ipsec site-to-site peer $($azpip.IpAddress) tunnel 1 allow-public-networks 'disable'
649646
set vpn ipsec site-to-site peer $($azpip.IpAddress) tunnel 1 local prefix '$($VyOSConfig.LocalCIDRPrefix)'

‎configs.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -582,9 +582,6 @@ $AzureSimpleVM = @{
582582
}
583583

584584

585-
586-
587-
588585
#============================================
589586
## ADVANCED CONFIGURATION
590587
#============================================

0 commit comments

Comments
 (0)