Move Amsterdam site gateway to norbert

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

           :routes => {
           :routes => {

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

           }
         }
       },
           }
         }
       },

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 4d3c83a747260f6be2195cc5648d77a6b59bb6a7..2730a8fb3cdb0996ef122f4c287c5c7f4a37b9fd 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -108,7 +108,6 @@ 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 50b8566ea36aa8fbfeefb1efb7443cba9898c2a1..7c31bb8f497c8c298658349bd9d1335512a19556 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,6 +2,10 @@ 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 => {


@@ -36,9 +40,11 @@ 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]"
 )