Merge remote-tracking branch 'github/pull/474'

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index ad5ea034b8fdda92c1d35a9dce339d4c1f54c1a2..68c55c8fa4a6098e52fc622f1ecb72e2e283c40f 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -6,7 +6,7 @@ default_attributes(
     :sources => ["ubuntugis-unstable"]
   },
   :bind => {
     :sources => ["ubuntugis-unstable"]
   },
   :bind => {

-    :clients => "equinix"
+    :clients => "equinix-ams"

   },
   :dhcpd => {
     :first_address => "10.0.63.1",
   },
   :dhcpd => {
     :first_address => "10.0.63.1",


@@ -63,6 +63,12 @@ default_attributes(
       "pdu1" => { :address => "10.0.48.100", :module => "apcups", :labels => { "site" => "amsterdam" } },
       "pdu2" => { :address => "10.0.48.101", :module => "apcups", :labels => { "site" => "amsterdam" } },
       "switch1" => { :address => "130.117.76.2", :module => "if_mib", :labels => { "site" => "amsterdam" } }
       "pdu1" => { :address => "10.0.48.100", :module => "apcups", :labels => { "site" => "amsterdam" } },
       "pdu2" => { :address => "10.0.48.101", :module => "apcups", :labels => { "site" => "amsterdam" } },
       "switch1" => { :address => "130.117.76.2", :module => "if_mib", :labels => { "site" => "amsterdam" } }

+    },
+    :metrics => {
+      :uplink_interface => {
+        :help => "Site uplink interface name",
+        :labels => { :site => "amsterdam", :name => "te1/0/1" }
+      }

     }
   },
   :rsyncd => {
     }
   },
   :rsyncd => {


@@ -93,23 +99,25 @@ default_attributes(
         :transfer_logging => false,
         :hosts_allow => [
           "193.60.236.0/24",          # ucl external
         :transfer_logging => false,
         :hosts_allow => [
           "193.60.236.0/24",          # ucl external

-          "10.0.48.0/20",             # equinix internal
-          "130.117.76.0/27",          # equinix external
-          "2001:978:2:2C::172:0/112", # equinix external
+          "10.0.48.0/20",             # amsterdam internal
+          "130.117.76.0/27",          # amsterdam external
+          "2001:978:2:2C::172:0/112", # amsterdam external
+          "10.0.64.0/20",             # dublin internal
+          "184.104.226.96/27",        # dublin external
+          "2001:470:1:b3b::/64",      # dublin external

           "10.0.32.0/20",             # bytemark internal
           "89.16.162.16/28",          # bytemark external
           "2001:41c9:2:d6::/64",      # bytemark external
           "127.0.0.0/8",              # localhost
           "::1"                       # localhost
           "10.0.32.0/20",             # bytemark internal
           "89.16.162.16/28",          # bytemark external
           "2001:41c9:2:d6::/64",      # bytemark external
           "127.0.0.0/8",              # localhost
           "::1"                       # localhost

-        ],
-        :nodes_allow => "roles:tilecache"
+        ]

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

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

   "role[gateway]",
   "role[web-storage]",
   "role[supybot]",
   "role[gateway]",
   "role[web-storage]",
   "role[supybot]",