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

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 4d3c83a747260f6be2195cc5648d77a6b59bb6a7..95bfe9e39cf2d7f15bac7847dff4fb175633d694 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -36,7 +36,7 @@ default_attributes(
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",
           :mode => "802.3ad",
           :lacprate => "fast",
           :xmithashpolicy => "layer3+4",

-          :slaves => %w[eth0 eth1]
+          :slaves => %w[enp2s0f0 enp2s0f1]

         }
       },
       :external => {
         }
       },
       :external => {


@@ -75,34 +75,6 @@ default_attributes(
           :max_size => "51200M"
       }
     }
           :max_size => "51200M"
       }
     }

-  },
-  :rsyncd => {
-    :modules => {
-      :logs => {
-        :comment => "Log files",
-        :path => "/store/logs",
-        :read_only => false,
-        :write_only => true,
-        :list => false,
-        :uid => "www-data",
-        :gid => "www-data",
-        :transfer_logging => false,
-        :hosts_allow => [
-          "193.60.236.0/24",          # ucl external
-          "10.0.48.0/20",             # amsterdam internal
-          "184.104.179.128/27",       # amsterdam external
-          "2001:470:1:fa1::/64",      # amsterdam external
-          "10.0.64.0/20",             # dublin internal
-          "184.104.226.96/27",        # dublin external
-          "2001:470:1:b3b::/64",      # dublin external
-          "10.0.32.0/20",             # bytemark internal
-          "89.16.162.16/28",          # bytemark external
-          "2001:41c9:2:d6::/64",      # bytemark external
-          "127.0.0.0/8",              # localhost
-          "::1"                       # localhost
-        ]
-      }
-    }

   }
 )
 
   }
 )
 


@@ -111,5 +83,6 @@ run_list(
   "role[gateway]",
   "recipe[rsyncd]",
   "recipe[dhcpd]",
   "role[gateway]",
   "recipe[rsyncd]",
   "recipe[dhcpd]",

-  "recipe[imagery::za_ngi_aerial]"
+  "recipe[imagery::za_ngi_aerial]",
+  "recipe[imagery::us_imagery]"

 )
 )