Add VLAN numbers to external interfaces of UCL machines

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 14b4ee518588ff058120d77e67f5587851143c0f..5d69d4a222c23ae6b7bc806c347973366369acb1 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -11,7 +11,7 @@ default_attributes(
         :address => "10.0.0.18"
       },
       :external_ipv4 => {
         :address => "10.0.0.18"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth1.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.10"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.10"

diff --git a/roles/clifford.rb b/roles/clifford.rb
index 6a760954936ffaa5fee9f9b9f7188b06bec47fab..72a57da61befabc3c5e757285ccfe90c75683130 100644 (file)
--- a/roles/clifford.rb
+++ b/roles/clifford.rb
@@ -11,7 +11,7 @@ default_attributes(
         :address => "10.0.0.17"
       },
       :external_ipv4 => {
         :address => "10.0.0.17"
       },
       :external_ipv4 => {

-        :interface => "enp2s0f1",
+        :interface => "enp2s0f1.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.11"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.11"

diff --git a/roles/draco.rb b/roles/draco.rb
index d5118704ea64a902dfe3c3384a0a01ef15b34410..0d0300b86afa0bc12641e8146a2ce769431806cb 100644 (file)
--- a/roles/draco.rb
+++ b/roles/draco.rb
@@ -11,7 +11,7 @@ default_attributes(
         :address => "10.0.0.11"
       },
       :external_ipv4 => {
         :address => "10.0.0.11"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth1.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.12"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.12"

diff --git a/roles/errol.rb b/roles/errol.rb
index f51c7571a8fe791379dbd1898678c6d56d86a50e..a3880421e24863845e7fca9a16c48853b4288199 100644 (file)
--- a/roles/errol.rb
+++ b/roles/errol.rb
@@ -33,7 +33,7 @@ default_attributes(
         :address => "10.0.0.14"
       },
       :external_ipv4 => {
         :address => "10.0.0.14"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth1.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.13"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.13"

diff --git a/roles/eustace.rb b/roles/eustace.rb
index 60ee48007a151bbbcda268f4b1c1c3566b48e9e8..21bcb0bfb4dc512875e9565606d6128dc2ef072e 100644 (file)
--- a/roles/eustace.rb
+++ b/roles/eustace.rb
@@ -11,7 +11,7 @@ default_attributes(
         :address => "10.0.0.9"
       },
       :external_ipv4 => {
         :address => "10.0.0.9"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth1.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.14"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.14"

diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb
index 1a04e42401b33da323be976e5dbb0324de2b80d7..434d4fe2478e34c32493b3b60328b7e52e807e3e 100644 (file)
--- a/roles/grindtooth.rb
+++ b/roles/grindtooth.rb
@@ -11,7 +11,7 @@ default_attributes(
         :address => "10.0.0.19"
       },
       :external_ipv4 => {
         :address => "10.0.0.19"
       },
       :external_ipv4 => {

-        :interface => "em2",
+        :interface => "em2.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.15"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.15"

diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb
index 4e72f95b1c57a8005422d1aac912d9b8097b8ca4..276b28cfb2f0f7cc43d86d8c51937e7603a1b549 100644 (file)
--- a/roles/noquiklos.rb
+++ b/roles/noquiklos.rb
@@ -11,7 +11,7 @@ default_attributes(
         :address => "10.0.0.13"
       },
       :external_ipv4 => {
         :address => "10.0.0.13"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth1.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.16"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.16"

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 5bac68a14e865c6fd324270d9252f8ce2c88ab61..1d499a5b40003078f17b71b5693439eb88c1c672 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -22,7 +22,7 @@ default_attributes(
         :address => "10.0.0.5"
       },
       :external_ipv4 => {
         :address => "10.0.0.5"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth1.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.17"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.17"

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 975157fb4e79367afdb157d8e50e9249aff4dfd0..79018449dcf51918b7c78d7abd2e1c7fd568ebab 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -11,7 +11,7 @@ default_attributes(
         :address => "10.0.0.20"
       },
       :external_ipv4 => {
         :address => "10.0.0.20"
       },
       :external_ipv4 => {

-        :interface => "em2",
+        :interface => "em2.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.18"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.18"

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 00dbc1ab2f866b49682c91e1a346c03ccb923ab2..b45dc3281537d9ea223cc372fd8a4aa5f501b403 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -33,7 +33,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {

-        :interface => "eth0",
+        :interface => "eth0.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.19"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.19"

diff --git a/roles/sarel.rb b/roles/sarel.rb
index 245fb0fedd0146777fd466d43d42e4130b0cc232..e8f22400da2aec92cc91fab2b4bfbaf5d8bf731f 100644 (file)
--- a/roles/sarel.rb
+++ b/roles/sarel.rb
@@ -11,7 +11,7 @@ default_attributes(
         :address => "10.0.0.12"
       },
       :external_ipv4 => {
         :address => "10.0.0.12"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth1.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.20"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.20"

diff --git a/roles/urmel.rb b/roles/urmel.rb
index 9b762e4e19d386d439292477b4e3d36b792970f8..a956e522155815a31df074b9ad9ee7c96de9637d 100644 (file)
--- a/roles/urmel.rb
+++ b/roles/urmel.rb
@@ -11,7 +11,7 @@ default_attributes(
         :address => "10.0.0.6"
       },
       :external_ipv4 => {
         :address => "10.0.0.6"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth1.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.21"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.21"

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index fe8577d2cd1dc04355d7a9196a5e49e8b6b7ab75..30f58fc4a31a104790ddbc9a40fa9c020b26e112 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -73,7 +73,7 @@ default_attributes(
         :address => "10.0.0.15"
       },
       :external_ipv4 => {
         :address => "10.0.0.15"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth1.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.22"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.22"

diff --git a/roles/zark.rb b/roles/zark.rb
index f61203872717a0dc30d4066115decb458cf3e403..f22a1366521db9c6294d241acd7ef717d56a23bd 100644 (file)
--- a/roles/zark.rb
+++ b/roles/zark.rb
@@ -11,7 +11,7 @@ default_attributes(
         :address => "10.0.0.8"
       },
       :external_ipv4 => {
         :address => "10.0.0.8"
       },
       :external_ipv4 => {

-        :interface => "eth1",
+        :interface => "eth1.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.23"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.23"