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

[chef.git] / roles / dribble.rb

diff --git a/roles/dribble.rb b/roles/dribble.rb
index 4611edced9adfc65fa7af304846c314f85cf7245..ce6da2faca4b9b97c69718d87a6b13dd8bc231a1 100644 (file)
--- a/roles/dribble.rb
+++ b/roles/dribble.rb
@@ -4,11 +4,12 @@ description "Master role applied to dribble"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
+      :internal => {

         :interface => "bond0",
         :role => :internal,
         :interface => "bond0",
         :role => :internal,

-        :family => :inet,
-        :address => "10.0.48.4",
+        :inet => {
+          :address => "10.0.48.4"
+        },

         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",
         :bond => {
           :mode => "802.3ad",
           :lacprate => "fast",


@@ -16,22 +17,26 @@ default_attributes(
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },
           :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
         }
       },

-      :external_ipv4 => {
-        :interface => "bond0.2",
+      :external => {
+        :interface => "bond0.3",

         :role => :external,
         :role => :external,

-        :family => :inet,
-        :address => "130.117.76.4"
-      },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:4"
+        :inet => {
+          :address => "184.104.179.132"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::4"
+        }

       }
     }
       }
     }

+  },
+  :accounts => {
+    :users => {
+      :stereo => { :status => :administrator }
+    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

 )
 )