Revert "Move AMS gateway to tabaluga"

This reverts commit 3fcbca9021c2343f8b1bbb13d99e5338a0dc7db2.

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 4043e0dd75a1cdb99b58edce9c64f23f40c8e1f2..d56d0540a16e3becdacfc2fc920e842777367bbb 100644 (file)
--- a/roles/equinix-ams.rb
+++ b/roles/equinix-ams.rb
@@ -7,9 +7,9 @@ default_attributes(
       :internal => {
         :inet => {
           :prefix => "20",
       :internal => {
         :inet => {
           :prefix => "20",

-          :gateway => "10.0.48.14",
+          :gateway => "10.0.48.10",

           :routes => {
           :routes => {

-            "10.0.0.0/8" => { :via => "10.0.48.14" }
+            "10.0.0.0/8" => { :via => "10.0.48.10" }

           }
         }
       },
           }
         }
       },

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index b5c07e67d057dc2f35d1ed6586a1833d22d0ae44..95bfe9e39cf2d7f15bac7847dff4fb175633d694 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -2,6 +2,10 @@ name "ironbelly"
 description "Master role applied to ironbelly"
 
 default_attributes(
 description "Master role applied to ironbelly"
 
 default_attributes(

+  :dhcpd => {
+    :first_address => "10.0.63.1",
+    :last_address => "10.0.63.254"
+  },

   :elasticsearch => {
     :cluster => {
       :routing => {
   :elasticsearch => {
     :cluster => {
       :routing => {


@@ -76,7 +80,9 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
 
 run_list(
   "role[equinix-ams]",

+  "role[gateway]",

   "recipe[rsyncd]",
   "recipe[rsyncd]",

+  "recipe[dhcpd]",

   "recipe[imagery::za_ngi_aerial]",
   "recipe[imagery::us_imagery]"
 )
   "recipe[imagery::za_ngi_aerial]",
   "recipe[imagery::us_imagery]"
 )

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index df8d76ea7e5b7ca6014e40bb9b13f3e15b8028ec..d682df74a591b22f06cf94db908fb64cb2e9b516 100644 (file)
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -2,10 +2,6 @@ name "tabaluga"
 description "Master role applied to tabaluga"
 
 default_attributes(
 description "Master role applied to tabaluga"
 
 default_attributes(

-  :dhcpd => {
-    :first_address => "10.0.63.1",
-    :last_address => "10.0.63.254"
-  },

   :networking => {
     :interfaces => {
       :internal => {
   :networking => {
     :interfaces => {
       :internal => {


@@ -37,7 +33,5 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
 
 run_list(
   "role[equinix-ams]",

-  "role[hp-g9]",
-  "role[gateway]",
-  "recipe[dhcpd]"
+  "role[hp-g9]"

 )
 )