From: Tom Hughes <tom@compton.nu>
Date: Fri, 6 May 2016 17:34:47 +0000 (+0100)
Subject: Add roles for spike-0[45] and thorn-0[45]
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/43347d24cd2f014c5a2f1c86eb951aaa0136d292

Add roles for spike-0[45] and thorn-0[45]
---

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index a8159ca66..7019492e4 100644
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -7,8 +7,22 @@ default_attributes(
   :networking => {
     :nameservers => ["8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"],
     :roles => {
+      :internal => {
+        :inet => {
+          :prefix => "20",
+          :gateway => "10.0.32.20"
+        }
+      },
       :external => {
-        :zone => "bm"
+        :zone => "bm",
+        :inet => {
+          :prefix => "28",
+          :gateway => "89.16.162.17"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "fe80::1"
+        }
       }
     }
   }
diff --git a/roles/spike-04.rb b/roles/spike-04.rb
new file mode 100644
index 000000000..a7535b309
--- /dev/null
+++ b/roles/spike-04.rb
@@ -0,0 +1,47 @@
+name "spike-04"
+description "Master role applied to spike-04"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.32.21",
+        :bond => {
+          :slaves => %w(eth0 eth1)
+        }
+      },
+      :external_ipv4 => {
+        :interface => "bond0.214",
+        :role => :external,
+        :family => :inet,
+        :address => "89.16.162.21"
+      },
+      :external_ipv6 => {
+        :interface => "bond0.214",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:41c9:2:d6::21"
+      }
+    }
+  },
+  :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"
+      }
+    }
+  }
+)
+
+run_list(
+  "role[bm]",
+  "role[web-frontend]",
+#  "role[web-gpximport]",
+#  "role[web-statistics]",
+#  "role[web-cleanup]"
+)
diff --git a/roles/spike-05.rb b/roles/spike-05.rb
new file mode 100644
index 000000000..7dcb968b0
--- /dev/null
+++ b/roles/spike-05.rb
@@ -0,0 +1,44 @@
+name "spike-05"
+description "Master role applied to spike-05"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.32.22",
+        :bond => {
+          :slaves => %w(eth0 eth1)
+        }
+      },
+      :external_ipv4 => {
+        :interface => "bond0.214",
+        :role => :external,
+        :family => :inet,
+        :address => "89.16.162.22"
+      },
+      :external_ipv6 => {
+        :interface => "bond0.214",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:41c9:2:d6::22"
+      }
+    }
+  },
+  :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"
+      }
+    }
+  }
+)
+
+run_list(
+  "role[bm]",
+  "role[web-frontend]"
+)
diff --git a/roles/thorn-04.rb b/roles/thorn-04.rb
new file mode 100644
index 000000000..348db2a38
--- /dev/null
+++ b/roles/thorn-04.rb
@@ -0,0 +1,32 @@
+name "thorn-04"
+description "Master role applied to thorn-04"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.32.41",
+        :bond => {
+          :slaves => %w(eth0 eth1)
+        }
+      }
+    }
+  },
+  :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"
+      }
+    }
+  }
+)
+
+run_list(
+  "role[bm]",
+  "role[web-backend]"
+)
diff --git a/roles/thorn-05.rb b/roles/thorn-05.rb
new file mode 100644
index 000000000..f90a4298a
--- /dev/null
+++ b/roles/thorn-05.rb
@@ -0,0 +1,32 @@
+name "thorn-05"
+description "Master role applied to thorn-05"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.32.42",
+        :bond => {
+          :slaves => %w(eth0 eth1)
+        }
+      }
+    }
+  },
+  :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"
+      }
+    }
+  }
+)
+
+run_list(
+  "role[bm]",
+  "role[web-backend]"
+)