Merge remote-tracking branch 'github/pull/725'

diff --git a/roles/aarnet.rb b/roles/aarnet.rb
deleted file mode 100644 (file)
index 8cab0ea..0000000
--- a/roles/aarnet.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-name "aarnet"
-description "Role applied to all servers at AARNet"
-
-default_attributes(
-  :accounts => {
-    :users => {
-      :chm => { :status => :administrator },
-      :bclifford => { :status => :administrator }
-    }
-  },
-  :hosted_by => "AARNet",
-  :location => "Carlton, Victoria, Australia",
-  :timezone => "Australia/Melbourne"
-)
-
-override_attributes(
-  :networking => {
-    :nameservers => ["202.158.207.1", "202.158.207.2"]
-  },
-  :ntp => {
-    :servers => ["0.au.pool.ntp.org", "1.au.pool.ntp.org", "oceania.pool.ntp.org"]
-  }
-)
-
-run_list(
-  "role[au]"
-)

diff --git a/roles/balerion.rb b/roles/balerion.rb
deleted file mode 100644 (file)
index 4aef19a..0000000
--- a/roles/balerion.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-name "balerion"
-description "Master role applied to balerion"
-
-default_attributes(
-  :networking => {
-    :interfaces => {
-      :external => {
-        :interface => "bond0",
-        :role => :external,
-        :inet => {
-          :address => "138.44.68.134",
-          :prefix => "30",
-          :gateway => "138.44.68.133"
-        },
-        :bond => {
-          :slaves => %w[ens14f0np0 ens14f1np1]
-        }
-      }
-    }
-  },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :effective_cache_size => "16GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => {
-        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
-      }
-    }
-  },
-  :tile => {
-    :database => {
-      :cluster => "16/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
-    :replication => {
-      :directory => "/store/replication"
-    },
-    :styles => {
-      :default => {
-        :tile_directories => [
-          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
-        ]
-      }
-    }
-  }
-)
-
-run_list(
-  "role[aarnet]",
-  "role[geodns]",
-  "role[tile]"
-)

diff --git a/roles/bowser.rb b/roles/bowser.rb
deleted file mode 100644 (file)
index eca0fa2..0000000
--- a/roles/bowser.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-name "bowser"
-description "Master role applied to bowser"
-
-default_attributes(
-  :networking => {
-    :interfaces => {
-      :external => {
-        :interface => "bond0",
-        :role => :external,
-        :inet => {
-          :address => "138.44.68.106",
-          :prefix => "30",
-          :gateway => "138.44.68.105"
-        },
-        :bond => {
-          :slaves => %w[ens14f0np0 ens14f1np1]
-        }
-      }
-    }
-  },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :effective_cache_size => "16GB"
-      }
-    }
-  },
-  :sysctl => {
-    :postgres => {
-      :comment => "Increase shared memory for postgres",
-      :parameters => {
-        "kernel.shmmax" => 9 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096
-      }
-    }
-  },
-  :tile => {
-    :database => {
-      :cluster => "16/main",
-      :postgis => "3"
-    },
-    :mapnik => "3.1",
-    :replication => {
-      :directory => "/store/replication"
-    },
-    :styles => {
-      :default => {
-        :tile_directories => [
-          { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
-        ]
-      }
-    }
-  }
-)
-
-run_list(
-  "role[aarnet]",
-  "role[tile]"
-)