From 9506b2a9f6cfc2bf3fcf41b0ac351f7af0a9b4ab Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 15 Feb 2021 22:23:51 +0000
Subject: [PATCH] Remove role for waima

---
 roles/catalyst.rb | 20 --------------------
 roles/waima.rb    | 39 ---------------------------------------
 2 files changed, 59 deletions(-)
 delete mode 100644 roles/catalyst.rb
 delete mode 100644 roles/waima.rb

diff --git a/roles/catalyst.rb b/roles/catalyst.rb
deleted file mode 100644
index 413be9ed8..000000000
--- a/roles/catalyst.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-name "catalyst"
-description "Role applied to all servers at Catalyst"
-
-default_attributes(
-  :hosted_by => "Catalyst",
-  :location => "Hamilton, New Zealand"
-)
-
-override_attributes(
-  :networking => {
-    :nameservers => ["202.78.244.85", "202.78.244.86", "202.78.244.87"]
-  },
-  :ntp => {
-    :servers => ["0.nz.pool.ntp.org", "1.nz.pool.ntp.org", "oceania.pool.ntp.org"]
-  }
-)
-
-run_list(
-  "role[nz]"
-)
diff --git a/roles/waima.rb b/roles/waima.rb
deleted file mode 100644
index 68f1682de..000000000
--- a/roles/waima.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-name "waima"
-description "Master role applied to waima"
-
-default_attributes(
-  :hardware => {
-    :shm_size => "12g"
-  },
-  :networking => {
-    :interfaces => {
-      :external_ipv4 => {
-        :interface => "ens3",
-        :role => :external,
-        :family => :inet,
-        :address => "192.168.1.4",
-        :prefix => "24",
-        :gateway => "192.168.1.1",
-        :public_address => "103.197.61.160"
-      }
-    }
-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "10240 MB",
-    :cache_dir => [
-      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
-  },
-  :tilecache => {
-    :tile_parent => "newzealand.render.openstreetmap.org"
-  }
-)
-
-run_list(
-  "role[catalyst]",
-  "role[tilecache]"
-)
-- 
2.39.5