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

[chef.git] / roles / spike-07.rb

diff --git a/roles/spike-07.rb b/roles/spike-07.rb
index 0e852a9d5af69e6783a9d742ff05f262c3028e07..640c67656e2ea95e7bfdfb4ee66811fbb3ee25bc 100644 (file)
--- a/roles/spike-07.rb
+++ b/roles/spike-07.rb
@@ -4,11 +4,12 @@ description "Master role applied to spike-07"
 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.12",
+        :inet => {
+          :address => "10.0.48.7"
+        },

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


@@ -16,17 +17,15 @@ default_attributes(
           :slaves => %w[eno1 eno2]
         }
       },
           :slaves => %w[eno1 eno2]
         }
       },

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

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

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

       }
     }
   }
       }
     }
   }