Introduce equinix-ams-public role for servers with public addresses

diff --git a/roles/dribble.rb b/roles/dribble.rb
index 75b09f26b8fa437190f085ea2f92dcda3e3ce652..b0bba80211c2f4e01b7cd1389c3f2410b99e80e0 100644 (file)
--- a/roles/dribble.rb
+++ b/roles/dribble.rb
@@ -40,6 +40,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[vectortile]"
 )
   "role[vectortile]"
 )

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index e754f61be626664afa6a08ee9c32b9b791d173f9..cc6b24fe653af8470b07e0888d6ea57c5616cff7 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -49,6 +49,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[nominatim]"
 )
   "role[nominatim]"
 )

diff --git a/roles/equinix-ams-public.rb b/roles/equinix-ams-public.rb
new file mode 100644 (file)
index 0000000..9939605
--- /dev/null
+++ b/roles/equinix-ams-public.rb
@@ -0,0 +1,43 @@
+name "equinix-ams-public"
+description "Role applied to all public servers at Equinix Amsterdam"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :henet => {
+        :interface => "bond0.3",
+        :role => :external,
+        :zone => "ams",
+        :metric => 150,
+        :source_route_table => 3,
+        :inet => {
+          :prefix => "27",
+          :gateway => "184.104.179.129"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "2001:470:1:fa1::1"
+        }
+      },
+      :equinix => {
+        :interface => "bond0.103",
+        :role => :external,
+        :zone => "ams",
+        :metric => 100,
+        :source_route_table => 103,
+        :inet => {
+          :prefix => "27",
+          :gateway => "82.199.86.97"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "2001:4d78:500:5e3::1"
+        }
+      }
+    }
+  }
+)
+
+run_list(
+  "role[equinix-ams-public]"
+)

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 1c14a5d9fec82ec92ccdcddc01fc37472b7266ee..8cf64cca7f3223eb6cec9b58cf6dcd7c8c69f8f2 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -19,36 +19,6 @@ default_attributes(
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4"
         }
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4"
         }

-      },
-      :henet => {
-        :interface => "bond0.3",
-        :role => :external,
-        :zone => "ams",
-        :metric => 150,
-        :source_route_table => 3,
-        :inet => {
-          :prefix => "27",
-          :gateway => "184.104.179.129"
-        },
-        :inet6 => {
-          :prefix => "64",
-          :gateway => "2001:470:1:fa1::1"
-        }
-      },
-      :equinix => {
-        :interface => "bond0.103",
-        :role => :external,
-        :zone => "ams",
-        :metric => 100,
-        :source_route_table => 103,
-        :inet => {
-          :prefix => "27",
-          :gateway => "82.199.86.97"
-        },
-        :inet6 => {
-          :prefix => "64",
-          :gateway => "2001:4d78:500:5e3::1"
-        }

       }
     }
   },
       }
     }
   },

diff --git a/roles/faffy.rb b/roles/faffy.rb
index 95774d0f8f750af0c2c912538772b43e36359006..e02510d18efa79e609dc6e3cebf377ad2f033f91 100644 (file)
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -33,6 +33,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[dev]"
 )
   "role[dev]"
 )

diff --git a/roles/lockheed.rb b/roles/lockheed.rb
index 8fd06591b05d14c05986bc1546918a6279713cf4..82acb48b46925fe3445601cdcd1aad5f90979532 100644 (file)
--- a/roles/lockheed.rb
+++ b/roles/lockheed.rb
@@ -82,7 +82,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[hp-g9]",
   "role[imagery]"
 )
   "role[hp-g9]",
   "role[imagery]"
 )

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 32b901afa950a89888cdd8f08b3058b60a02caad..357dc0d5a84b2264b6c4a5591866641871dddd14 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -36,7 +36,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[geodns]",
   "role[backup]",
   "role[planet]",
   "role[geodns]",
   "role[backup]",
   "role[planet]",

diff --git a/roles/odin.rb b/roles/odin.rb
index 178fd97dbd8fc292bd6eccdb4cbadee37f0b6796..9d5bd1cfcc67ef5ff552594f2181d3ceb8925713 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -125,6 +125,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[tile]"
 )
   "role[tile]"
 )

diff --git a/roles/spike-06.rb b/roles/spike-06.rb
index d7f3b35a31c0b3759293e7a58d155caaa88447a0..b5d84e6a61378c234a07e9c27d2528396acf42bc 100644 (file)
--- a/roles/spike-06.rb
+++ b/roles/spike-06.rb
@@ -33,7 +33,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[hp-g9]",
   "role[web-frontend]",
   "role[web-statistics]",
   "role[hp-g9]",
   "role[web-frontend]",
   "role[web-statistics]",

diff --git a/roles/spike-07.rb b/roles/spike-07.rb
index 47649fa8bda8fa8cae87937c1df8e87ea476bfdd..1664329195b938039f0ac5ebfd803c07a1bcd8a9 100644 (file)
--- a/roles/spike-07.rb
+++ b/roles/spike-07.rb
@@ -33,7 +33,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[hp-g9]",
   "role[web-frontend]"
 )
   "role[hp-g9]",
   "role[web-frontend]"
 )

diff --git a/roles/spike-08.rb b/roles/spike-08.rb
index f1e667fa551270e5a1f2d43037f475f54870e875..46f0be788ee8073046e99079483d4bb30cba7988 100644 (file)
--- a/roles/spike-08.rb
+++ b/roles/spike-08.rb
@@ -33,7 +33,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[hp-g9]",
   "role[web-frontend]"
 )
   "role[hp-g9]",
   "role[web-frontend]"
 )

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 569aa774023e6003d3555ce18500688712ad0fc9..1ad1ee227ec69f713c16100a73f9f84acf434f38 100644 (file)
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -52,7 +52,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[hp-g9]",
   "role[blog-staging]",
   "role[taginfo]",
   "role[hp-g9]",
   "role[blog-staging]",
   "role[taginfo]",

diff --git a/roles/vhagar.rb b/roles/vhagar.rb
index f79dbb6f3f91b8af7665a2c9cba7731887b52abf..c8cd4a92fbf07dbe2c2e37aa2b83927114bc70e5 100644 (file)
--- a/roles/vhagar.rb
+++ b/roles/vhagar.rb
@@ -40,6 +40,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix-ams]",
+  "role[equinix-ams-public]",

   "role[nominatim]"
 )
   "role[nominatim]"
 )