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

[chef.git] / roles / backup.rb

diff --git a/roles/backup.rb b/roles/backup.rb
index f282f116f37b28f9cc34fdc22f74725870e8279c..1a9f1911bbd8b5ad4aa1246b7aa8d6f502b841b7 100644 (file)
--- a/roles/backup.rb
+++ b/roles/backup.rb
@@ -19,11 +19,16 @@ default_attributes(
         :gid => "osmbackup",
         :transfer_logging => false,
         :hosts_allow => [
-          "128.40.168.0/24",                     # ucl external
+          "128.40.168.0/24",                     # ucl external (wates)
+          "128.40.45.192/27",                    # ucl external (wolfson)
           "146.179.159.160/27",                  # ic internal
           "193.63.75.96/27",                     # ic external
           "2001:630:12:500::/64",                # ic external
-          "2001:41c8:10:996:21d:7dff:fec3:df70", # shenron
+          "10.0.32.0/20",                        # bytemark internal
+          "89.16.162.16/28",                     # bytemark external
+          "2001:41c9:2:d6::/64",                 # bytemark external
+          "212.110.172.32",                      # shenron
+          "2001:41c9:1:400::32",                 # shenron
           "127.0.0.0/8",                         # localhost
           "::1"                                  # localhost
         ]