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

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

diff --git a/roles/spike-02.rb b/roles/spike-02.rb
index 52d51ad30b11a52ba59106b2558feb73a14fdecb..4e178bdec3f011b97f5d206311ae95351a773abf 100644 (file)
--- a/roles/spike-02.rb
+++ b/roles/spike-02.rb
@@ -4,42 +4,36 @@ description "Master role applied to spike-02"
 default_attributes(
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "bond0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.48.7",
+      :internal => {
+        :inet => {
+          :address => "10.0.64.4"
+        },
         :bond => {
-          :slaves => %w[eth0 eth1]
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
       },
-      :external_ipv4 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet,
-        :address => "130.117.76.7"
+      :henet => {
+        :inet => {
+          :address => "184.104.226.100"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::4"
+        }
       },
-      :external_ipv6 => {
-        :interface => "bond0.2",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:978:2:2C::172:7"
-      }
-    }
-  },
-  :sysctl => {
-    :ipv6_autoconf => {
-      :comment => "Disable IPv6 auto-configuration on internal interface",
-      :parameters => {
-        "net.ipv6.conf.eth0.autoconf" => "0",
-        "net.ipv6.conf.eth0.accept_ra" => "0"
+      :equinix => {
+        :inet => {
+          :address => "87.252.214.100"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::4"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[equinix]",
-  "role[hp-dl360-g6]",
+  "role[equinix-dub-public]",
+  "role[hp-g9]",
   "role[web-frontend]"
 )