Revert "Move Amsterdam site gateway to norbert"

This reverts commit 04a8aea0708afb576b70ac823abd5d6bad2372c6.

diff --git a/roles/equinix-ams.rb b/roles/equinix-ams.rb
index 771586a8de7cf1afa9ee9a77ddfdfca01e907c74..7923e09d46e744837baf0221ae07bf37f14c4df6 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.17",
+          :gateway => "10.0.48.10",

           :routes => {
           :routes => {

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

           }
         }
       },
           }
         }
       },

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 70ae3b14e4c3ddfbed0630a27be1651851f9e1d9..55849585908a4df5a7a1772280f68f7f223a73d2 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -108,6 +108,7 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
 
 run_list(
   "role[equinix-ams]",

+  "role[gateway]",

   "recipe[rsyncd]",
   "recipe[dhcpd]",
   "recipe[imagery::za_ngi_aerial]"
   "recipe[rsyncd]",
   "recipe[dhcpd]",
   "recipe[imagery::za_ngi_aerial]"

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 7c31bb8f497c8c298658349bd9d1335512a19556..50b8566ea36aa8fbfeefb1efb7443cba9898c2a1 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,10 +2,6 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
 description "Master role applied to norbert"
 
 default_attributes(

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

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


@@ -40,11 +36,9 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
 
 run_list(
   "role[equinix-ams]",

-  "role[gateway]",

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

-  "recipe[dhcpd]",

   "recipe[tilelog]"
 )
   "recipe[tilelog]"
 )