From: Tom Hughes <tom@compton.nu>
Date: Sun, 9 Oct 2016 16:37:08 +0000 (+0100)
Subject: Add role for culebre
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/b65088c61c96a83d98736afda98e43a2b83972ee?hp=5b551a1cef6be428bc0b1b3ad04d0e9fe39409e4

Add role for culebre
---

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index c1ba829fe..345ebd860 100644
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -30,3 +30,4 @@ ex:osm		<%= @type %>
 dh:osm		<%= @type %>
 aws:osm		<%= @type %>
 ds:osm		<%= @type %>
+uz:osm          <%= @type %>
diff --git a/roles/culebre.rb b/roles/culebre.rb
new file mode 100644
index 000000000..502816b1c
--- /dev/null
+++ b/roles/culebre.rb
@@ -0,0 +1,43 @@
+name "culebre"
+description "Master role applied to culebre"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "ens3",
+        :role => :external,
+        :family => :inet,
+        :address => "155.210.4.103",
+        :prefix => "28",
+        :gateway => "155.210.4.110"
+      },
+      :internal_ipv4 => {
+        :interface => "ens4",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.148.97.151",
+        :prefix => "24"
+      }
+    }
+  },
+  :squid => {
+    :cache_mem => "6100 MB",
+    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "london.render.openstreetmap.org",
+    :tile_siblings => [
+      "trogdor.openstreetmap.org",
+      "katie.openstreetmap.org",
+      "konqi.openstreetmap.org",
+      "ridgeback.openstreetmap.org",
+      "gorynych.openstreetmap.org"
+    ]
+  }
+)
+
+run_list(
+  "role[unizar]",
+  "role[tilecache]"
+)
diff --git a/roles/es.rb b/roles/es.rb
new file mode 100644
index 000000000..4c66e5308
--- /dev/null
+++ b/roles/es.rb
@@ -0,0 +1,10 @@
+name "es"
+description "Role applied to all servers located in Spain"
+
+override_attributes(
+  :country => "es"
+)
+
+run_list(
+  "role[base]"
+)
diff --git a/roles/unizar.rb b/roles/unizar.rb
new file mode 100644
index 000000000..1d91a0615
--- /dev/null
+++ b/roles/unizar.rb
@@ -0,0 +1,23 @@
+name "unizar"
+description "Role applied to all servers at University of Zaragoza"
+
+default_attributes(
+  :accounts => {
+    :users => {
+    }
+  },
+  :hosted_by => "University of Zaragoza",
+  :location => "Zaragoza, Spain",
+  :networking => {
+    :nameservers => ["155.210.12.9", "155.210.3.12"],
+    :roles => {
+      :external => {
+        :zone => "uz"
+      }
+    }
+  }
+)
+
+run_list(
+  "role[es]"
+)