Correct paths to tftp root directory

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index ad5ea034b8fdda92c1d35a9dce339d4c1f54c1a2..d19422decac12d23989a466cd7cb2317872e5d81 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 => {


@@ -109,7 +115,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

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

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