Move gateway for amsterdam to tabaluga

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index f421e3d39e2ceebf232ee93f9cbe8188d33f926d..2621b0b7eaeb07a17861612a87dd6332bb7811be 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -7,9 +7,9 @@ default_attributes(
       :internal => {
         :inet => {
           :prefix => "20",
-          :gateway => "10.0.48.10",
+          :gateway => "10.0.48.14",
           :routes => {
-            "10.0.0.0/8" => { :via => "10.0.48.10" }
+            "10.0.0.0/8" => { :via => "10.0.48.14" }
           }
         }
       },
@@ -46,7 +46,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
-    :nameservers => ["10.0.48.10", "74.82.42.42", "2001:470:20::2"],
+    :nameservers => ["10.0.48.14", "74.82.42.42", "2001:470:20::2"],
     :search => ["ams.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 209b351705958ce390199f4ed7c1c9f1f325cad7..e59b4683f75b300a3c95b256d4297f6087d692dd 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -2,10 +2,6 @@ name "ironbelly"
 description "Master role applied to ironbelly"
 
 default_attributes(
-  :dhcpd => {
-    :first_address => "10.0.63.1",
-    :last_address => "10.0.63.254"
-  },
   :elasticsearch => {
     :cluster => {
       :routing => {
@@ -51,21 +47,6 @@ default_attributes(
       }
     }
   },
-  :prometheus => {
-    :junos => {
-      "switch1" => { :address => "184.104.179.129", :labels => { "site" => "amsterdam" } }
-    },
-    :snmp => {
-      "pdu1" => { :address => "10.0.48.100", :modules => %w[apcups], :labels => { "site" => "amsterdam" } },
-      "pdu2" => { :address => "10.0.48.101", :modules => %w[apcups], :labels => { "site" => "amsterdam" } }
-    },
-    :metrics => {
-      :uplink_interface => {
-        :help => "Site uplink interface name",
-        :labels => { :site => "amsterdam", :name => "ge-[01]/2/[02]" }
-      }
-    }
-  },
   :nginx => {
     :cache => {
       :proxy => {
@@ -80,7 +61,5 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
-  "role[gateway]",
-  "recipe[rsyncd]",
-  "recipe[dhcpd]"
+  "recipe[rsyncd]"
 )

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 3667d73dfaea8a1fccbbe81ebda6e711218a8133..a902737784a66b6e43b369b6b4084a4509525c1b 100644 (file)
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -2,6 +2,10 @@ name "tabaluga"
 description "Master role applied to tabaluga"
 
 default_attributes(
+  :dhcpd => {
+    :first_address => "10.0.63.1",
+    :last_address => "10.0.63.254"
+  },
   :networking => {
     :interfaces => {
       :internal => {
@@ -28,6 +32,21 @@ default_attributes(
         }
       }
     }
+  },
+  :prometheus => {
+    :junos => {
+      "switch1" => { :address => "184.104.179.129", :labels => { "site" => "amsterdam" } }
+    },
+    :snmp => {
+      "pdu1" => { :address => "10.0.48.100", :modules => %w[apcups], :labels => { "site" => "amsterdam" } },
+      "pdu2" => { :address => "10.0.48.101", :modules => %w[apcups], :labels => { "site" => "amsterdam" } }
+    },
+    :metrics => {
+      :uplink_interface => {
+        :help => "Site uplink interface name",
+        :labels => { :site => "amsterdam", :name => "ge-[01]/2/[02]" }
+      }
+    }
   }
 )
 
@@ -35,5 +54,7 @@ run_list(
   "role[equinix-ams]",
   "role[hp-g9]",
   "role[blog-staging]",
-  "role[taginfo]"
+  "role[taginfo]",
+  "role[gateway]",
+  "recipe[dhcpd]"
 )