Revert "community: Fix CSRF issue with monkey patch fix"

[chef.git] / roles / muirdris.rb

diff --git a/roles/muirdris.rb b/roles/muirdris.rb
index b8c0347444800ecc6a5fb44f316f803da4bdfa4a..b77e4f8df859371857bf90a458fa1371e5692c7b 100644 (file)
--- a/roles/muirdris.rb
+++ b/roles/muirdris.rb
@@ -2,13 +2,17 @@ name "muirdris"
 description "Master role applied to muirdris"
 
 default_attributes(
 description "Master role applied to muirdris"
 
 default_attributes(

+  :memcached => {
+    :memory_limit => 128 * 1024
+  },

   :networking => {
     :interfaces => {
   :networking => {
     :interfaces => {

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

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

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

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


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

-      :external_ipv4 => {
+      :external_he => {

         :interface => "bond0.101",
         :role => :external,
         :interface => "bond0.101",
         :role => :external,

-        :family => :inet,
-        :address => "184.104.226.111"
+        :source_route_table => 100,
+        :inet => {
+          :address => "184.104.226.111",
+          :prefix => "27",
+          :gateway => "184.104.226.97"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::f",
+          :prefix => 64,
+          :gateway => "2001:470:1:b3b::1"
+        }

       },
       },

-      :external_ipv6 => {
-        :interface => "bond0.101",
+      :external => {
+        :interface => "bond0.203",

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

-        :family => :inet6,
-        :address => "2001:470:1:b3b::f"
+        :metric => 150,
+        :source_route_table => 150,
+        :inet => {
+          :address => "87.252.214.111",
+          :prefix => "27",
+          :gateway => "87.252.214.97"
+        },
+        :inet6 => {
+          :address => "2001:4d78:fe03:1c::f",
+          :prefix => 64,
+          :gateway => "2001:4d78:fe03:1c::1"
+        }

       }
     }
   }
       }
     }
   }