Update katla and grisu for move to Bytemark

diff --git a/roles/db-slave.rb b/roles/db-slave.rb
index cc49870d928cf9e6d67b0832abfcdaf7f25fd319..c80f9a4cb5512520232ab2877f7f22c94f026b10 100644 (file)
--- a/roles/db-slave.rb
+++ b/roles/db-slave.rb
@@ -10,12 +10,12 @@ default_attributes(
         :hot_standby_feedback => "on",
         :standby_mode => "on",
         :primary_conninfo => {
-          :host => "katla.ic.openstreetmap.org",
+          :host => "katla.bm.openstreetmap.org",
           :port => "5432",
           :user => "replication",
           :passwords => { :bag => "db", :item => "passwords" }
         },
-        :restore_command => "/usr/bin/rsync katla.ic.openstreetmap.org::archive/%f %p"
+        :restore_command => "/usr/bin/rsync katla.bm.openstreetmap.org::archive/%f %p"
       }
     }
   }

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index d8e6b5b5082aeb8d9afd756bc52a0b758c0ff417..099fc38bb0114f297d3f4f042e489f9c587275ce 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -31,6 +31,14 @@ default_attributes(
           :host => "ironbelly.openstreetmap.org",
           :port => "1195"
         }
+      },
+      :aws2bm => {
+        :port => "1195",
+        :mode => "client",
+        :peer => {
+          :host => "grisu.openstreetmap.org",
+          :port => "1195"
+        }
       }
     }
   },

diff --git a/roles/grisu.rb b/roles/grisu.rb
index d572d88f00e398c1c053c101c5c53dd7b5525597..bd0cb806574fa6b662158b426be04affc479079f 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -4,34 +4,55 @@ description "Master role applied to grisu"
 default_attributes(
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.32.20",
+        :bond => {
+          :slaves => %w(em1 em2)
+        }
+      },
       :external_ipv4 => {
-        :interface => "em1",
+        :interface => "bond0.214",
         :role => :external,
         :family => :inet,
-        :address => "193.63.75.108",
-        :hwaddress => "d8:d3:85:5d:87:a0"
+        :address => "89.16.162.20"
       },
       :external_ipv6 => {
-        :interface => "em1",
+        :interface => "bond0.214",
         :role => :external,
         :family => :inet6,
-        :address => "2001:630:12:500:dad3:85ff:fe5d:87a0"
+        :address => "2001:41c9:2:d6::20"
+      }
+    }
+  },
+  :openvpn => {
+    :address => "10.0.16.5",
+    :tunnels => {
+      :aws2bm => {
+        :port => "1194",
+        :mode => "server",
+        :peer => {
+          :host => "ironbelly.openstreetmap.org"
+        }
       },
-      :internal_ipv4 => {
-        :interface => "em2",
-        :role => :internal,
-        :family => :inet,
-        :address => "146.179.159.168",
-        :hwaddress => "d8:d3:85:5d:87:a1"
+      :ic2bm => {
+        :port => "1195",
+        :mode => "server",
+        :peer => {
+          :host => "fafnir.openstreetmap.org"
+        }
       }
     }
   }
 )
 
 run_list(
-  "role[ic]",
+  "role[bytemark]",
   "role[hp-dl180-g6]",
   "role[gateway]",
   "role[web-storage]",
-  "role[planet]"
+  "role[planet]",
+  "recipe[openvpn]"
 )

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 13f9652266617ba93e0dcea0e0bd27bdfd60e007..0cdc647e1d4b16622b54a4f1dead9a868ccc763f 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -66,6 +66,14 @@ default_attributes(
         :peer => {
           :host => "fafnir.openstreetmap.org"
         }
+      },
+      :ic2bm => {
+        :port => "1196",
+        :mode => "client",
+        :peer => {
+          :host => "grisu.openstreetmap.org",
+          :port => "1194"
+        }
       }
     }
   },

diff --git a/roles/katla.rb b/roles/katla.rb
index 674dd854efcc363d49273afa4212e05aa14a5440..8023e0e305f06f5b7e2301b31344d942de9a5225 100644 (file)
--- a/roles/katla.rb
+++ b/roles/katla.rb
@@ -50,11 +50,13 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "bond0",
         :role => :internal,
         :family => :inet,
-        :address => "146.179.159.173",
-        :hwaddress => "00:25:90:94:91:00"
+        :address => "10.0.32.40",
+        :bond => {
+          :slaves => %w(eth0 eth1)
+        }
       }
     }
   },
@@ -69,6 +71,13 @@ default_attributes(
     }
   },
   :sysctl => {
+    :ipv6_autoconf => {
+      :comment => "Disable IPv6 auto-configuration on internal interface",
+      :parameters => {
+        "net.ipv6.conf.bond0.autoconf" => "0",
+        "net.ipv6.conf.bond0.accept_ra" => "0"
+      }
+    },
     :postgres => {
       :comment => "Increase shared memory for postgres",
       :parameters => {
@@ -80,7 +89,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ic]",
+  "role[bytemark]",
   "role[db-master]",
   "role[db-backup]"
 )

diff --git a/roles/web.rb b/roles/web.rb
index fdc96a64cac01a5eb1b909f6e4a0bca8c3f8c03d..f1ecaac8c163635052292bbeea3871368e5e3c99 100644 (file)
--- a/roles/web.rb
+++ b/roles/web.rb
@@ -15,7 +15,7 @@ default_attributes(
   },
   :web => {
     :status => "database_readonly",
-    :database_host => "db-slave",
-    :readonly_database_host => "db-slave"
+    :database_host => "ramoth.ic.openstreetmap.org",
+    :readonly_database_host => "ramoth.ic.openstreetmap.org"
   }
 )