Move us and za imagery to lockheed

[chef.git] / roles / lockheed.rb

diff --git a/roles/lockheed.rb b/roles/lockheed.rb
index ec3f788f7c12a42123949897951662c695a37960..b03347148a8b8f99b6a7316aa24249ff01a89301 100644 (file)
--- a/roles/lockheed.rb
+++ b/roles/lockheed.rb
@@ -4,36 +4,36 @@ description "Master role applied to lockheed"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
+      :internal => {
         :interface => "bond0",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.16",
+        :inet => {
+          :address => "10.0.48.16"
+        },
         :bond => {
-          :slaves => %w[eth0 eth1]
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno49 eno50]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",
         :role => :external,
-        :family => :inet,
-        :address => "130.117.76.16"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:10"
+        :inet => {
+          :address => "184.104.179.144"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::10"
+        }
       }
-
     }
   }
 )
 
 run_list(
   "role[equinix-ams]",
-  "role[subversion]",
-  "role[trac]",
-  "role[irc]",
-  "recipe[blogs]"
+  "role[hp-g9]",
+  "recipe[imagery::za_ngi_aerial]",
+  "recipe[imagery::us_imagery]"
 )