Use OS root certificiate bundle to avoid wordpress API via chef ruby

[chef.git] / roles / faffy.rb

diff --git a/roles/faffy.rb b/roles/faffy.rb
index 0b02de126903ce54d8b0241945dcd805f27f5ef6..c4963d181d276f936173aa090941dc7a58415999 100644 (file)
--- a/roles/faffy.rb
+++ b/roles/faffy.rb
@@ -4,59 +4,34 @@ description "Master role applied to faffy"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
-        :interface => "eth0",
+      :internal => {
+        :interface => "bond0",

         :role => :internal,
         :role => :internal,

-        :family => :inet,
-        :address => "10.0.0.7"
+        :inet => {
+          :address => "10.0.48.3"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
+        }

       },
       },

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

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

-        :family => :inet,
-        :address => "128.40.45.198"
-      }
-    }
-  },
-  :rsyncd => {
-    :modules => {
-      :agri_imagery => {
-        :comment => "AGRI Imagery Archive",
-        :path => "/mnt/md0/agri",
-        :read_only => true,
-        :write_only => false,
-        :list => true,
-        :uid => "nobody",
-        :gid => "nogroup",
-        :transfer_logging => false,
-        :exclude => [".*"],
-        :max_connections => 10,
-        :ignore_errors => true,
-        :ignore_nonreadable => true,
-        :timeout => 3600,
-        :refuse_options => ["checksum"]
-      },
-      :agri_extra => {
-        :comment => "AGRI Extras Archive",
-        :path => "/var/www/agri.openstreetmap.org/download",
-        :read_only => true,
-        :write_only => false,
-        :list => true,
-        :uid => "nobody",
-        :gid => "nogroup",
-        :transfer_logging => false,
-        :exclude => [".*"],
-        :max_connections => 10,
-        :ignore_errors => true,
-        :ignore_nonreadable => true,
-        :timeout => 3600,
-        :refuse_options => ["checksum"]
+        :inet => {
+          :address => "184.104.179.131"
+        },
+        :inet6 => {
+          :address => "2001:470:1:fa1::3"
+        }

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[ucl-wolfson]",
-  "recipe[rsyncd]"
+  "role[equinix-ams]",
+  "role[dev]"

 )
 )