Add VLAN numbers to internal interfaces of UCL machines

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 4cf1d2c2471d455dad8e3cdee5a425fe453eea66..7725f4907570646a5141d560a178cb294c02baa1 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.18"

diff --git a/roles/clifford.rb b/roles/clifford.rb
index 5a66931280876406febf042fe7d237ce7e6e42ab..7b8031c495e7436d96e4abcfbfe485df8ebafc2d 100644 (file)
--- a/roles/clifford.rb
+++ b/roles/clifford.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "enp2s0f1",
+        :interface => "enp2s0f1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.17"

diff --git a/roles/draco.rb b/roles/draco.rb
index 2e756e3e319c249985664eabadb1b5d8c98d1e3c..bae4026e597ba8ab663d855a3492946240433eda 100644 (file)
--- a/roles/draco.rb
+++ b/roles/draco.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.11"

diff --git a/roles/errol.rb b/roles/errol.rb
index 2efcf2007e70bb3da57860c757bb37c522f7a1c2..2ae72ee626034b40607015e150183b13da6dfd63 100644 (file)
--- a/roles/errol.rb
+++ b/roles/errol.rb
@@ -27,7 +27,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.14"

diff --git a/roles/eustace.rb b/roles/eustace.rb
index f69f5ff37f2204caaeb52a81bd9eab6d72bd932e..d2115dac97327cc409cebea0b95a42a7e3accd87 100644 (file)
--- a/roles/eustace.rb
+++ b/roles/eustace.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.9"

diff --git a/roles/grindtooth.rb b/roles/grindtooth.rb
index 875359f298c90df253e62767c830aabb191b6ed5..28f2c8cd9b3dc80934e49eeb9ced57a428433bf4 100644 (file)
--- a/roles/grindtooth.rb
+++ b/roles/grindtooth.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "em2",
+        :interface => "em2.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.19"

diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb
index 44c4a01851981c7f8480ce4b0ba7c53a0ff32ec1..d92aedf5ae72ea796aa61d212a7671aae4971d11 100644 (file)
--- a/roles/noquiklos.rb
+++ b/roles/noquiklos.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.13"

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 92267fb28058fc1e6ad192cdf90cd004062f1072..084037f5643f24afb12b94ca47c3bd9704d1fdae 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -16,7 +16,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.5"

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index cffcab8b7b3997d3c4509de7143112ce62f039f5..d8992dd75bf95ae3e35cc17464271f78b504389f 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "em2",
+        :interface => "em2.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 999482f8e0100c58f15cd1d4ee71f76e261651f1..d87bd4b1d1a790841aaf441d3a51ae9846a2dde5 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -39,7 +39,7 @@ default_attributes(
         :address => "193.60.236.19"
       },
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "eth0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.3"

diff --git a/roles/sarel.rb b/roles/sarel.rb
index d5a1b5faca231083860253dfbb7b5d58486e2f49..8f58b0b4b3a5f5acc8ff1cba7af09a07596b0d10 100644 (file)
--- a/roles/sarel.rb
+++ b/roles/sarel.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.12"

diff --git a/roles/urmel.rb b/roles/urmel.rb
index 1f78688d9343ba1b44dcd6e6ce574d1d73b83b5e..f239ead315594a9a38064fc42c82f42a3f3fadd0 100644 (file)
--- a/roles/urmel.rb
+++ b/roles/urmel.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.6"

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index fc7127ff407f01cd9364f10ca46c0844a2b38dcf..8a3f1dd369af16c1f38eb457ddb323b84c57b33b 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -67,7 +67,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.15"

diff --git a/roles/zark.rb b/roles/zark.rb
index 7dbd7d7e04088fd4802882a31c0513020b61c145..8a6fc9748ea47716926695d4300b45c01cb14fd6 100644 (file)
--- a/roles/zark.rb
+++ b/roles/zark.rb
@@ -5,7 +5,7 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth1.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.8"