From 76878fb6b0a62ec461334134502df1e25c6f8d62 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 12 Oct 2015 10:58:57 +0100
Subject: [PATCH] Add role for drogon

---
 roles/carnet.rb   | 10 ----------
 roles/drogon.rb   | 49 +++++++++++++++++++++++++++++++++++++++++++++++
 roles/viserion.rb | 17 +++++++++++++++-
 3 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 roles/drogon.rb

diff --git a/roles/carnet.rb b/roles/carnet.rb
index 854094333..249157bd2 100644
--- a/roles/carnet.rb
+++ b/roles/carnet.rb
@@ -4,20 +4,10 @@ description "Role applied to all servers at CARNet"
 default_attributes(
   :accounts => {
     :users => {
-      :anovak => { :status => :administrator },
       :hbogner => { :status => :administrator }
     }
   },
-  :munin => {
-    :allow => ["193.198.233.210"]
-  },
   :networking => {
-    :nameservers => [
-      "161.53.2.66",
-      "2001:b68:ff:1::2",
-      "2001:b68:ff:2::2",
-      "2001:4860:4860::8888"
-    ],
     :roles => {
       :external => {
         :zone => "cnt"
diff --git a/roles/drogon.rb b/roles/drogon.rb
new file mode 100644
index 000000000..57d27ab7d
--- /dev/null
+++ b/roles/drogon.rb
@@ -0,0 +1,49 @@
+name "drogon"
+description "Master role applied to drogon"
+
+default_attributes(
+  :accounts => {
+    :users => {
+      :zelja => { :status => :administrator }
+    }
+  },
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet,
+        :address => "161.53.30.107",
+        :prefix => "27",
+        :gateway => "161.53.30.97"
+      },
+      :external_ipv6 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:b68:c0ff:0:221:5eff:fe40:c7c4",
+        :prefix => "64",
+        :gateway => "fe80::161:53:30:97"
+      }
+    },
+    :nameservers => [
+      "161.53.30.100",
+      "8.8.8.8"
+    ]
+  },
+  :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 => [
+      "viserion.openstreetmap.org"
+    ]
+  }
+)
+
+run_list(
+  "role[carnet]",
+  "role[tilecache]"
+)
diff --git a/roles/viserion.rb b/roles/viserion.rb
index 51f0cd7da..8686fbfba 100644
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -2,6 +2,14 @@ name "viserion"
 description "Master role applied to viserion"
 
 default_attributes(
+  :accounts => {
+    :users => {
+      :anovak => { :status => :administrator }
+    }
+  },
+  :munin => {
+    :allow => ["193.198.233.210"]
+  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -20,7 +28,13 @@ default_attributes(
         :prefix => "64",
         :gateway => "2001:b68:4cff:3::1"
       }
-    }
+    },
+    :nameservers => [
+      "161.53.2.66",
+      "2001:b68:ff:1::2",
+      "2001:b68:ff:2::2",
+      "2001:4860:4860::8888"
+    ]
   },
   :squid => {
     :cache_mem => "12500 MB",
@@ -29,6 +43,7 @@ default_attributes(
   :tilecache => {
     :tile_parent => "pula.render.openstreetmap.org",
     :tile_siblings => [
+      "drogon.openstreetmap.org"
     ]
   }
 )
-- 
2.39.5