From 996199b6f3db83b1306e77a4bd96e8cfe4f6a58f Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 11 Sep 2014 11:12:10 +0100
Subject: [PATCH] Add role for viserion

---
 .../templates/default/shorewall-zones.erb     |  1 +
 roles/carnet.rb                               | 29 ++++++++++++++
 roles/hr.rb                                   | 10 +++++
 roles/viserion.rb                             | 39 +++++++++++++++++++
 4 files changed, 79 insertions(+)
 create mode 100644 roles/carnet.rb
 create mode 100644 roles/hr.rb
 create mode 100644 roles/viserion.rb

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index 2de26df69..ab5ba7428 100644
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -22,3 +22,4 @@ bh:osm		<%= @type %>
 dt:osm		<%= @type %>
 nc:osm		<%= @type %>
 ool:osm		<%= @type %>
+cnt:osm		<%= @type %>
diff --git a/roles/carnet.rb b/roles/carnet.rb
new file mode 100644
index 000000000..ebbea7bd4
--- /dev/null
+++ b/roles/carnet.rb
@@ -0,0 +1,29 @@
+name "carnet"
+description "Role applied to all servers at CARNet"
+
+default_attributes(
+  :accounts => {
+    :users => {
+      :anovak => { :status => :administrator },
+      :hbogner => { :status => :administrator }
+    }
+  },
+  :networking => {
+    :nameservers => [ "2001:b68:ff:1::2", "2001:b68:ff:2::2", "2001:4860:4860::8888" ],
+    :roles => {
+      :external => {
+        :zone => "cnt"
+      }
+    }
+  }
+)
+
+override_attributes(
+  :ntp => {
+    :servers => [ "0.hr.pool.ntp.org", "1.hr.pool.ntp.org", "europe.pool.ntp.org" ]
+  }
+)
+
+run_list(
+  "role[fr]"
+)
diff --git a/roles/hr.rb b/roles/hr.rb
new file mode 100644
index 000000000..f5bc1e1a9
--- /dev/null
+++ b/roles/hr.rb
@@ -0,0 +1,10 @@
+name "hr"
+description "Role applied to all servers located in Croatia"
+
+override_attributes(
+  :country => "hr"
+)
+
+run_list(
+  "role[base]"
+)
diff --git a/roles/viserion.rb b/roles/viserion.rb
new file mode 100644
index 000000000..6179736d4
--- /dev/null
+++ b/roles/viserion.rb
@@ -0,0 +1,39 @@
+name "viserion"
+description "Master role applied to viserion"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet,
+        :address => "193.198.233.211",
+        :prefix => "27",
+        :gateway => "193.198.233.209"
+      },
+      :external_ipv6 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:b68:4cff:3::2",
+        :prefix => "128",
+        :gateway => "fe80::217:fff:fead:14c0"
+      }
+    }
+  },
+  :squid => {
+    :cache_mem => "12500 MB",
+    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "pula.render.openstreetmap.org",
+    :tile_siblings => [
+    ]
+  }
+)
+
+run_list(
+  "role[carnet]",
+  "role[tilecache]"
+)
-- 
2.43.2