Add role for balerion

diff --git a/roles/aarnet.rb b/roles/aarnet.rb
index f028c23b04b2199c4c71273c1e164c71b3b1c2b6..7cda2b70e270849125e0acdcb61d6231e6945dcb 100644 (file)
--- a/roles/aarnet.rb
+++ b/roles/aarnet.rb
@@ -8,7 +8,11 @@ default_attributes(
       :bclifford => { :status => :administrator }
     }
   },
-  :hosted_by => "AARNet"
+  :hosted_by => "AARNet",
+  :location => "Carlton, Victoria, Australia",
+  :networking => {
+    :nameservers => ["202.158.207.1", "202.158.207.2"]
+  }
 )
 
 override_attributes(

diff --git a/roles/balerion.rb b/roles/balerion.rb
new file mode 100644 (file)
index 0000000..749a046
--- /dev/null
+++ b/roles/balerion.rb
@@ -0,0 +1,37 @@
+name "balerion"
+description "Master role applied to balerion"
+
+default_attributes(
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "bond0",
+        :role => :external,
+        :family => :inet,
+        :address => "138.44.68.134",
+        :prefix => "30",
+        :gateway => "138.44.68.133",
+        :bond => {
+          :slaves => %w[ens14f0 ens14f1]
+        }
+      }
+    }
+  },
+  :squid => {
+    :cache_mem => "32000 MB",
+    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "melbourne.render.openstreetmap.org",
+    :tile_siblings => [
+      "waima.openstreetmap.org",
+      "tuatara.openstreetmap.org",
+      "longma.openstreetmap.org"
+    ]
+  }
+)
+
+run_list(
+  "role[aarnet]",
+  "role[tilecache]"
+)

diff --git a/roles/bowser.rb b/roles/bowser.rb
index 1ae0353930c4ceb789c0ef2ab733bc7d864a753b..ebee5e5d44b570f56a2e5c4722203a134862f6f9 100644 (file)
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -5,7 +5,6 @@ default_attributes(
   :apt => {
     :sources => ["postgresql"]
   },
-  :location => "Carlton, Victoria, Australia",
   :networking => {
     :interfaces => {
       :external_ipv4 => {
@@ -19,11 +18,7 @@ default_attributes(
           :slaves => %w[ens14f0 ens14f1]
         }
       }
-    },
-    :nameservers => [
-      "202.158.207.1",
-      "202.158.207.2"
-    ]
+    }
   },
   :postgresql => {
     :versions => ["10"],

diff --git a/roles/longma.rb b/roles/longma.rb
index 8de62a5d03f402a8823505d4c5dc47fe5b8c3c29..6639332e32f1d15736ec153527bd85c35f0c5594 100644 (file)
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -32,7 +32,12 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
-    :tile_parent => "hsinchu.render.openstreetmap.org"
+    :tile_parent => "hsinchu.render.openstreetmap.org",
+    :tile_siblings => [
+      "balerion.openstreetmap.org",
+      "waima.openstreetmap.org",
+      "tuatara.openstreetmap.org"
+    ]
   }
 )
 

diff --git a/roles/tuatara.rb b/roles/tuatara.rb
index 018542645dd071d7309517bfed1ee3ea4c3559f6..02d70cd309bd861b55ba9da2d966f2e3d9e141db 100644 (file)
--- a/roles/tuatara.rb
+++ b/roles/tuatara.rb
@@ -22,6 +22,7 @@ default_attributes(
     :tile_parent => "wellington.render.openstreetmap.org",
     :tile_siblings => [
       "waima.openstreetmap.org",
+      "balerion.openstreetmap.org",
       "longma.openstreetmap.org"
     ]
   }

diff --git a/roles/waima.rb b/roles/waima.rb
index 0b7cbc341cd3d574f0f1defbd0c8be42bc1d5184..14f11546dc76a8db152d9d3380fa2f242e5236cd 100644 (file)
--- a/roles/waima.rb
+++ b/roles/waima.rb
@@ -23,6 +23,7 @@ default_attributes(
     :tile_parent => "hamilton.render.openstreetmap.org",
     :tile_siblings => [
       "tuatara.openstreetmap.org",
+      "balerion.openstreetmap.org",
       "longma.openstreetmap.org"
     ]
   }