From: Tom Hughes <tom@compton.nu>
Date: Wed, 7 Dec 2016 18:03:29 +0000 (+0000)
Subject: Add VLAN numbers to internal interfaces of UCL machines
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/aca8c4a423f9c883abbafe30c02f0f7272ace6b9

Add VLAN numbers to internal interfaces of UCL machines
---

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 4cf1d2c24..7725f4907 100644
--- 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 5a6693128..7b8031c49 100644
--- 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 2e756e3e3..bae4026e5 100644
--- 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 2efcf2007..2ae72ee62 100644
--- 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 f69f5ff37..d2115dac9 100644
--- 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 875359f29..28f2c8cd9 100644
--- 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 44c4a0185..d92aedf5a 100644
--- 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 92267fb28..084037f56 100644
--- 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 cffcab8b7..d8992dd75 100644
--- 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 999482f8e..d87bd4b1d 100644
--- 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 d5a1b5fac..8f58b0b4b 100644
--- 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 1f78688d9..f239ead31 100644
--- 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 fc7127ff4..8a3f1dd36 100644
--- 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 7dbd7d7e0..8a6fc9748 100644
--- 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"