]> git.openstreetmap.org Git - chef.git/commitdiff
Remove traces of katla and old tyan-s7010 role
authorGrant Slater <github@firefishy.com>
Wed, 18 Jan 2023 17:31:45 +0000 (17:31 +0000)
committerGrant Slater <github@firefishy.com>
Wed, 18 Jan 2023 17:31:45 +0000 (17:31 +0000)
README.md
cookbooks/bind/templates/default/db.10.erb
cookbooks/openssh/templates/default/ssh_known_hosts.erb
roles/tyan-s7010.rb [deleted file]

index 65b41d6090b638a502aecc20ad0de8f3748b9fbb..ee9933fc25057219cbbec5d2025862d4f207db99 100644 (file)
--- a/README.md
+++ b/README.md
@@ -14,16 +14,16 @@ servers.
 
 We make extensive use of roles to configure the servers. In general we have:
 
-## Server-specific roles (e.g. [katla.rb](roles/katla.rb))
+## Server-specific roles (e.g. [faffy.rb](roles/faffy.rb))
 
 These deal with particular setup or quirks of a server, such as its IP address. They also include roles representing the service they are performing, and the location they are in and any particular hardware they have that needs configuration.
 All our servers are [named after dragons](https://wiki.openstreetmap.org/wiki/Servers/Name_Ideas).
 
-## Hardware-specific roles (e.g. [tyan-s7010.rb](roles/tyan-s7010.rb))
+## Hardware-specific roles (e.g. [hp-g9.rb](roles/hp-g9.rb))
 
 Covers anything specific to a certain piece of hardware, like a motherboard, that could apply to multiple machines.
 
-## Location-specific roles (e.g. [equinix.rb](roles/equinix.rb))
+## Location-specific roles (e.g. [equinix-dub.rb](roles/equinix-dub.rb))
 
 These form a hierarchy of datacentres, organisations, and countries where our servers are located.
 
index cce2c7f072cd0691203af45c4d1443a1ce0b609e..86b22f80b996609676e406e8af30ee3a7e17ff05 100644 (file)
@@ -35,12 +35,10 @@ $TTL        604800
 20.32.0                IN      PTR     grisu.bm.openstreetmap.org.
 21.32.0                IN      PTR     spike-04.bm.openstreetmap.org.
 22.32.0                IN      PTR     spike-05.bm.openstreetmap.org.
-40.32.0                IN      PTR     katla.bm.openstreetmap.org.
 
 20.33.0                IN      PTR     grisu.oob.openstreetmap.org.
 21.33.0                IN      PTR     spike-04.oob.openstreetmap.org.
 22.33.0                IN      PTR     spike-05.oob.openstreetmap.org.
-40.33.0                IN      PTR     katla.oob.openstreetmap.org.
 
 3.48.0         IN      PTR     faffy.ams.openstreetmap.org.
 4.48.0         IN      PTR     dribble.ams.openstreetmap.org.
index 4834c68e12007ee1fcd91f847f66480c96371125..df6de5c701252df0a98f921faf1e2d842366fea1 100644 (file)
@@ -34,8 +34,6 @@ grisu.oob.openstreetmap.org,grisu.oob,10.0.33.20 ssh-rsa AAAAB3NzaC1yc2EAAAADAQA
 grisu.oob.openstreetmap.org,grisu.oob,10.0.33.20 ssh-dss AAAAB3NzaC1kc3MAAACBAIrAKvS58z4zmaRWwebJxgUUiy/P2+AWODjz2FcqspmkXXnSkXD/tz3djsp/PwgPUPt/y1J+H2dfDY0qnTtY4SM1DJi0848/BG/C1P0zb/3mdtJO2FdMVVcwITCX0XZg7ikFf4zZ9CJRiuAbiS6CKCIXcvxHhBx0O4EEaK5/PwLxAAAAFQC6Rg2wsfl3aKpecSD0ed9Ysekx8wAAAIAo1yE6yLCH6+4NEA2+2mz3XWXdf/nzOWzFd1XqZIqg3Jj8MzaNS1GLbm3FlVwl7qlXr60flsXggYkZxwXyLKMH9fhFnyrTZOJMKmLKmeqcDTZqItW7hwsaKvM1vd+ZysmOVkFiXKJuD+25AyTmbFpNUvBdIHYiL1jQaIxLEWnN+wAAAIAuF7tHFgLgrZ84nc3Yb003llMmiwwaSUjF2t9y81t+FJ4fOwhFO7lIapijrsm17v5OBSOgAONfgzNS39U+VlX61PwDmIobe8+Q8zGOv/9tkK79YwNsG/dXhQ3e7gZH4wcyNgO1BufEuAOYMxE454rbv6fdrhvsUlRgEvF+teJqrQ==
 spike-04.oob.openstreetmap.org,spike-04.oob,10.0.33.21 ssh-dss AAAAB3NzaC1kc3MAAACBAKZf6qtRHGHjPfOP3drwO1m28l4fpN5X5c8ArkeKhV3aTzY404uwCsSvfYQUw/s24E+989MWZxLUO0Ib+nV+hWlK0nxI85bQPIvOjaWNtbggOfNdz4VyNcLxxzsiJqNhQpGQ3LW2zQ7fsP9pM5ALAs7MDOaSdNja58aUgEMY1ta5AAAAFQC1r9L5Mkax780fOnwkDB6eIaNjCwAAAH97vSxdyRel4IucL4Ckn7Y/zVwFeLpwHiVP41MN7dO2aApuWvsygLU/FUAouv/3PRug/bAAS56w2/JLKVvyo1aRPNHAvgPFEDodqLc+dnC1bXFu1VR69ntQYTEe6iReLlwzeEPLwTW5ucGHddXVbP2jG3R+JEmGGt87P3JxicCjAAAAgQCIrf3Ca5+Cyk7/QYU2krboxC/qhHwjvtzBpcAtVya4YPpkiQa4G5KrJQ8oxvLL7j1atgYs+GnErkeUp89SLLMJ1spbjMMubA//Mr56Bp/V/ZCr7uk6c67vA+P+EIb9QhqJt6eay4fFZ75dccw76GnDunD6ADf1VTzawYykyIrm8Q==
 spike-05.oob.openstreetmap.org,spike-05.oob,10.0.33.22 ssh-dss AAAAB3NzaC1kc3MAAACBAKZf6qtRHGHjPfOP3drwO1m28l4fpN5X5c8ArkeKhV3aTzY404uwCsSvfYQUw/s24E+989MWZxLUO0Ib+nV+hWlK0nxI85bQPIvOjaWNtbggOfNdz4VyNcLxxzsiJqNhQpGQ3LW2zQ7fsP9pM5ALAs7MDOaSdNja58aUgEMY1ta5AAAAFQC1r9L5Mkax780fOnwkDB6eIaNjCwAAAH97vSxdyRel4IucL4Ckn7Y/zVwFeLpwHiVP41MN7dO2aApuWvsygLU/FUAouv/3PRug/bAAS56w2/JLKVvyo1aRPNHAvgPFEDodqLc+dnC1bXFu1VR69ntQYTEe6iReLlwzeEPLwTW5ucGHddXVbP2jG3R+JEmGGt87P3JxicCjAAAAgEvdV6XL4KV/RCLZFhyM6sSGOWOia22L2Ddc28mS8MdZTr8b/iYJpFUCmGREovFxNI5MXzPhDKTomiW6UKmoxhQcsS31Y70BdsMA+XcNqwktFUkFfXMaat43gJ8gL5lVDI3AomjxIfGoouFEhIzTrj0JYMNf/q02YJm7fPvAZtuv
-katla.oob.openstreetmap.org,katla.oob,10.0.33.40 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgwCIJ+bSxbMsr6wurBXYkeqoznHnJT4zrN7nHtajgs5CJLIiWO+Eq/Lp+egz6Irxwk3v+kbfKW9RUum5fOMfkWFwaQxP41Cz5RbMmu5Jsm4MQKr4PPVxbLbPk75OeVgo+nfkzBupsBuYGMp/GCpjTJ8rusPmYxzWBek4amKL5udfA9Ld
-katla.oob.openstreetmap.org,katla.oob,10.0.33.40 ssh-dss AAAAB3NzaC1kc3MAAACBAP4oHi33lAVyP8zjoRZe6kxcZGJi1JOgF1vpZqEsxA97yCaLGVjc2cdxi16namqdJ/DgQaRpGRM+chP6AgGN9FD8Z6Wfskm+2sghPpcGRUkr7u6mM7WlJ0xQehD4LDcxFEpZKxtalf6TlxXn9cO0VaL9NNVrpU34c2Pqxl7wg/QnAAAAFQCB10EQxYDOnsxN2xrSHEbmgA3K0wAAAIAWN0b4KREM6Uc6FVkRtOjkiAR8FWmCg8nNQaqlKIPlM4hsrIcPC5yZfc7BzamQSy4PpHNGZG64CkYr8tn8LGWouHVKKbeFOWEXIBsRBSf1NNaYI7cS7WPnGVOmkt6yHvWwPlDcVO8FpPUL9pA7kf6iCuQNdD/MyOBHdbVoU9LcNAAAAIEAsXBb+3EZhsRAYL9Jm22PsrsW2o/hO7aomMeEXvVGG8Wuy77lqmcIvlyW3zhHBs7ubI9TZz1XDsgLK9giCkmqCyKmUsTXGsu9e4veOq+sgvXdbhoBMVi90IFsPLPUdPN5mfovBDHkwi60VtDwOLAX368pFfBfSA50CZWfhwUu26E=
 thorn-04.oob.openstreetmap.org,thorn-04.oob,10.0.33.41 ssh-dss AAAAB3NzaC1kc3MAAACBAKZf6qtRHGHjPfOP3drwO1m28l4fpN5X5c8ArkeKhV3aTzY404uwCsSvfYQUw/s24E+989MWZxLUO0Ib+nV+hWlK0nxI85bQPIvOjaWNtbggOfNdz4VyNcLxxzsiJqNhQpGQ3LW2zQ7fsP9pM5ALAs7MDOaSdNja58aUgEMY1ta5AAAAFQC1r9L5Mkax780fOnwkDB6eIaNjCwAAAH97vSxdyRel4IucL4Ckn7Y/zVwFeLpwHiVP41MN7dO2aApuWvsygLU/FUAouv/3PRug/bAAS56w2/JLKVvyo1aRPNHAvgPFEDodqLc+dnC1bXFu1VR69ntQYTEe6iReLlwzeEPLwTW5ucGHddXVbP2jG3R+JEmGGt87P3JxicCjAAAAgH5H4Ra0f4+LfMyJbVpoJIN9wPrC0bbNEJUVIOmtPpxRE4HvoqDOBE8XfHIunhNeTxK5Yzfinz+fCq2XCv/8Sgrr1qJBUQwi9kHfRBNmRJyoylxY0b33Dpsk5kxcAl06+sSugl/OcbXAyW4H3d+dQAUMlRPEVzQCgd98gGrTFF6p
 thorn-05.oob.openstreetmap.org,thorn-05.oob,10.0.33.42 ssh-dss AAAAB3NzaC1kc3MAAACBAKZf6qtRHGHjPfOP3drwO1m28l4fpN5X5c8ArkeKhV3aTzY404uwCsSvfYQUw/s24E+989MWZxLUO0Ib+nV+hWlK0nxI85bQPIvOjaWNtbggOfNdz4VyNcLxxzsiJqNhQpGQ3LW2zQ7fsP9pM5ALAs7MDOaSdNja58aUgEMY1ta5AAAAFQC1r9L5Mkax780fOnwkDB6eIaNjCwAAAH97vSxdyRel4IucL4Ckn7Y/zVwFeLpwHiVP41MN7dO2aApuWvsygLU/FUAouv/3PRug/bAAS56w2/JLKVvyo1aRPNHAvgPFEDodqLc+dnC1bXFu1VR69ntQYTEe6iReLlwzeEPLwTW5ucGHddXVbP2jG3R+JEmGGt87P3JxicCjAAAAgQCYjNImXo+2xnRT7T/JiHh+eNl8I5i/sjB4KBaHizKuJnwH4heLbPtmbI9ze9MV0IHJp/289kwT3bSgj0nY9zi9Ucdry0WtPgGQO4JbDZXzCBhwa6MhZVLAIOKU34fK6AIuZqzQJwXeJZuCIiwaoliUwY+QwNcX3rQho80eaK6XFg==
 dulcy.oob.openstreetmap.org,dulcy.oob,10.0.49.9 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgmlwXGPIPDqoMz4s5edr+G4iuBnCYcFXjY7Et9jG/ezI6aIKd9lEOXvnHJX5hrC21aqd06dhyMLwZN+eSjJhXNaLtYmm5P442H2ZnGca1KNSpF7yRVhn0eRpX39xWK3biVfMw64mzvV3636C1adCkgBwuaqCvz1EHm/KRrySfuETFLU=
diff --git a/roles/tyan-s7010.rb b/roles/tyan-s7010.rb
deleted file mode 100644 (file)
index fb1cd1b..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-name "tyan-s7010"
-description "Role applied to machines using the Tyan S7010 motherboard"
-
-default_attributes(
-  :hardware => {
-    :hwmon => {
-      "i2c_0_0_002f" => {
-        :ignore => %w[fan3 fan4 fan5 fan6 fan7 fan8 fan9 fan10 fan11 fan12]
-      }
-    },
-    :ipmi => {
-      :excluded_sensors => [13, 14, 15, 16, 17, 18, 19, 20]
-    },
-    :modules => %w[i2c_i801 jc42 w83793],
-    :sensors => {
-      "jc42-*" => {
-        :temps => {
-          "temp1" => { :max => 75 }
-        }
-      },
-      "w83793-i2c-*-2f" => {
-        :volts => {
-          "in0" => { :min => 0.696, :max => 1.424 },
-          "in1" => { :min => 0.696, :max => 1.424 },
-          "in5" => { :min => 2.992, :max => 3.536 },
-          "in9" => { :min => 2.608, :max => 3.536 }
-        },
-        :fans => {
-          "fan1" => { :min => 1500 },
-          "fan2" => { :min => 1500 },
-          "fan3" => { :ignore => true },
-          "fan4" => { :ignore => true },
-          "fan5" => { :ignore => true },
-          "fan6" => { :ignore => true },
-          "fan7" => { :ignore => true },
-          "fan8" => { :ignore => true },
-          "fan9" => { :ignore => true },
-          "fan10" => { :ignore => true },
-          "fan11" => { :ignore => true },
-          "fan12" => { :ignore => true }
-        },
-        :temps => {
-          "temp5" => { :max => 78, :max_hyst => 73 },
-          "temp6" => { :max => 78, :max_hyst => 73 }
-        }
-      }
-    }
-  },
-  :munin => {
-    :plugins => {
-      :ipmi_fans => {
-        :Sys3Front1 => { :graph => "no", :warning => "0:" },
-        :Sys4Front2 => { :graph => "no", :warning => "0:" },
-        :Sys5Rear1 => { :graph => "no", :warning => "0:" },
-        :Sys6 => { :graph => "no", :warning => "0:" },
-        :Sys7 => { :graph => "no", :warning => "0:" },
-        :Sys8 => { :graph => "no", :warning => "0:" },
-        :Sys9 => { :graph => "no", :warning => "0:" },
-        :Sys10 => { :graph => "no", :warning => "0:" }
-      },
-      :ipmi_temp => {
-        :CPU0belowTmax => { :critical => "10:" },
-        :CPU1belowTmax => { :critical => "10:" }
-      },
-      :sensors_volt => {
-        "VCoreA" => { :warning => "0.70:1.42", :critical => "0.70:1.42" },
-        "VCoreB" => { :warning => "0.70:1.42", :critical => "0.70:1.42" },
-        "in2" => { :warning => "0.00:2.05", :critical => "0.00:2.05" },
-        "in3" => { :warning => "0.00:4.08", :critical => "0.00:4.08" },
-        "in4" => { :warning => "0.00:4.08", :critical => "0.00:4.08" },
-        "in5" => { :warning => "2.99:3.54", :critical => "2.99:3.54" },
-        "in6" => { :warning => "0.00:2.04", :critical => "0.00:2.04" },
-        "+5V" => { :warning => "4.52:5.50", :critical => "4.52:5.50" },
-        "5VSB" => { :warning => "4.52:5.50", :critical => "4.52:5.50" },
-        "Vbat" => { :warning => "2.70:3.30", :critical => "2.70:3.30" }
-      }
-    }
-  }
-)