From 5f273f1b91609cb4b5d1c1cfbd145b8f0e494202 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 7 Dec 2016 13:01:14 +0000 Subject: [PATCH] Add VLAN numbers to external interfaces of UCL machines --- roles/ascalon.rb | 2 +- roles/clifford.rb | 2 +- roles/draco.rb | 2 +- roles/errol.rb | 2 +- roles/eustace.rb | 2 +- roles/grindtooth.rb | 2 +- roles/noquiklos.rb | 2 +- roles/norbert.rb | 2 +- roles/pummelzacken.rb | 2 +- roles/ridley.rb | 2 +- roles/sarel.rb | 2 +- roles/urmel.rb | 2 +- roles/yevaud.rb | 2 +- roles/zark.rb | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/roles/ascalon.rb b/roles/ascalon.rb index 14b4ee518..5d69d4a22 100644 --- a/roles/ascalon.rb +++ b/roles/ascalon.rb @@ -11,7 +11,7 @@ default_attributes( :address => "10.0.0.18" }, :external_ipv4 => { - :interface => "eth1", + :interface => "eth1.2800", :role => :external, :family => :inet, :address => "193.60.236.10" diff --git a/roles/clifford.rb b/roles/clifford.rb index 6a7609549..72a57da61 100644 --- a/roles/clifford.rb +++ b/roles/clifford.rb @@ -11,7 +11,7 @@ default_attributes( :address => "10.0.0.17" }, :external_ipv4 => { - :interface => "enp2s0f1", + :interface => "enp2s0f1.2800", :role => :external, :family => :inet, :address => "193.60.236.11" diff --git a/roles/draco.rb b/roles/draco.rb index d5118704e..0d0300b86 100644 --- a/roles/draco.rb +++ b/roles/draco.rb @@ -11,7 +11,7 @@ default_attributes( :address => "10.0.0.11" }, :external_ipv4 => { - :interface => "eth1", + :interface => "eth1.2800", :role => :external, :family => :inet, :address => "193.60.236.12" diff --git a/roles/errol.rb b/roles/errol.rb index f51c7571a..a3880421e 100644 --- a/roles/errol.rb +++ b/roles/errol.rb @@ -33,7 +33,7 @@ default_attributes( :address => "10.0.0.14" }, :external_ipv4 => { - :interface => "eth1", + :interface => "eth1.2800", :role => :external, :family => :inet, :address => "193.60.236.13" diff --git a/roles/eustace.rb b/roles/eustace.rb index 60ee48007..21bcb0bfb 100644 --- a/roles/eustace.rb +++ b/roles/eustace.rb @@ -11,7 +11,7 @@ default_attributes( :address => "10.0.0.9" }, :external_ipv4 => { - :interface => "eth1", + :interface => "eth1.2800", :role => :external, :family => :inet, :address => "193.60.236.14" diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb index 1a04e4240..434d4fe24 100644 --- a/roles/grindtooth.rb +++ b/roles/grindtooth.rb @@ -11,7 +11,7 @@ default_attributes( :address => "10.0.0.19" }, :external_ipv4 => { - :interface => "em2", + :interface => "em2.2800", :role => :external, :family => :inet, :address => "193.60.236.15" diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb index 4e72f95b1..276b28cfb 100644 --- a/roles/noquiklos.rb +++ b/roles/noquiklos.rb @@ -11,7 +11,7 @@ default_attributes( :address => "10.0.0.13" }, :external_ipv4 => { - :interface => "eth1", + :interface => "eth1.2800", :role => :external, :family => :inet, :address => "193.60.236.16" diff --git a/roles/norbert.rb b/roles/norbert.rb index 5bac68a14..1d499a5b4 100644 --- a/roles/norbert.rb +++ b/roles/norbert.rb @@ -22,7 +22,7 @@ default_attributes( :address => "10.0.0.5" }, :external_ipv4 => { - :interface => "eth1", + :interface => "eth1.2800", :role => :external, :family => :inet, :address => "193.60.236.17" diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb index 975157fb4..79018449d 100644 --- a/roles/pummelzacken.rb +++ b/roles/pummelzacken.rb @@ -11,7 +11,7 @@ default_attributes( :address => "10.0.0.20" }, :external_ipv4 => { - :interface => "em2", + :interface => "em2.2800", :role => :external, :family => :inet, :address => "193.60.236.18" diff --git a/roles/ridley.rb b/roles/ridley.rb index 00dbc1ab2..b45dc3281 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -33,7 +33,7 @@ default_attributes( :networking => { :interfaces => { :external_ipv4 => { - :interface => "eth0", + :interface => "eth0.2800", :role => :external, :family => :inet, :address => "193.60.236.19" diff --git a/roles/sarel.rb b/roles/sarel.rb index 245fb0fed..e8f22400d 100644 --- a/roles/sarel.rb +++ b/roles/sarel.rb @@ -11,7 +11,7 @@ default_attributes( :address => "10.0.0.12" }, :external_ipv4 => { - :interface => "eth1", + :interface => "eth1.2800", :role => :external, :family => :inet, :address => "193.60.236.20" diff --git a/roles/urmel.rb b/roles/urmel.rb index 9b762e4e1..a956e5221 100644 --- a/roles/urmel.rb +++ b/roles/urmel.rb @@ -11,7 +11,7 @@ default_attributes( :address => "10.0.0.6" }, :external_ipv4 => { - :interface => "eth1", + :interface => "eth1.2800", :role => :external, :family => :inet, :address => "193.60.236.21" diff --git a/roles/yevaud.rb b/roles/yevaud.rb index fe8577d2c..30f58fc4a 100644 --- a/roles/yevaud.rb +++ b/roles/yevaud.rb @@ -73,7 +73,7 @@ default_attributes( :address => "10.0.0.15" }, :external_ipv4 => { - :interface => "eth1", + :interface => "eth1.2800", :role => :external, :family => :inet, :address => "193.60.236.22" diff --git a/roles/zark.rb b/roles/zark.rb index f61203872..f22a13665 100644 --- a/roles/zark.rb +++ b/roles/zark.rb @@ -11,7 +11,7 @@ default_attributes( :address => "10.0.0.8" }, :external_ipv4 => { - :interface => "eth1", + :interface => "eth1.2800", :role => :external, :family => :inet, :address => "193.60.236.23" -- 2.43.2