1 files changed, 7 insertions, 77 deletions
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index b81e0a8..b4b35a7 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -202,15 +202,9 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVZjxA6lge9gk9jtZRhYtXNZK0wp2QjrwEi9Vh7xSNku6RalawG3RrVfDsbZ4cAjkF4lUINuyEucppeOC7FdDMN/HGo1tPdRs10zow4xNGaPm9XOeWVi53l2nIvu95IlQDh7XTLkhHmjELNvnQPc/BfZrM8MBjqZxJLNTUw117D06dtSomELEjemyMA9DAReFe3gbymUyhmH8Brre9lYeIa26yoMD8fSk1tfBRlq30YhblswWGSogEPW5AupfbS1Lb4KjqeGBwFJIvc8pxibmEVT9IiEGd72TPXipQ/iyHq011lnzzvLRhqjE6CUc4gNRU+R0sfF1isQmSfW/FGqdr"
     ip_address: "199.119.112.206"
     port: 22
-  clam: 
-    domain_full: clam.dev.bitmask.net
-    domain_internal: clam.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf"
-    ip_address: "37.218.242.213"
-    port: 4422
   demodex: 
-    domain_full: demodex.dev.bitmask.net
-    domain_internal: demodex.dev.bitmask.i
+    domain_full: demodex.unstable.bitmask.net
+    domain_internal: demodex.unstable.bitmask.i
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCx1qgYlN/Y69I0mn2NhjEw8RtSMw3XoQ79lushppGJlQse7lJx0fNyKc/xy/qxi0YSrgoXKm/gD4GaESqFglvIygDuNxiVyBDGUfCpPvmkp+q9eduBFL+UrIoLdsxpjx0hfLZfZ6YoXwGd44sK5pcn+5ov9h4HZCrjxDEAGr/Tg2hU+UXSV53136MZuGT4ylXZ3jIM6c6Pm9tBFSVH3TUuSmbzgCVTbvA2g6OqskMRACov0NrmADr8MfO6idRqIlZ/s8FmJOKtOjQMbQWq52PJ4yIEcaSUE0fmlERLnHVCrKfDojVOgXfeazHN9td2xojQTkT44rm/bqp1bx/QRss9"
     ip_address: "204.13.164.171"
     port: 22
@@ -233,16 +227,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzQJXmGyldmFNuUoUoZuf1N78/p5Wb0UYKlnKbx+ydwux1xMheVyoroheAd19Pc42nxKsdEi3qhlPTRoo+8IGluNgU+ptUE6x3490/AcaKsPZEkAsXpzMFYFki+YDPEfA3+Rlq8BmNZi4/EHtZwtPt907tKmojn3bc13i+4z/lQkHL/foe+NTveQ46UUa23ZEwRibZ7QZfmdk+hu3S2Dmz+JsHb5hxbUziSYUkbcm2lrhy7IEJyncwE2U4sVdlZmgnoNvgsbuvlhhDFGrFGXedD2BfxeYhjJj8Nga1y7BYdfFlodxczpEHiiLO8h1sbVhVUOxIdLu/e+ZfGuJfvFsR"
     ip_address: "199.119.112.207"
     port: 22
-  elephant: 
-    aliases: 
-      - api.dev.bitmask.net
-      - dev.bitmask.net
-      - nicknym.dev.bitmask.net
-    domain_full: elephant.dev.bitmask.net
-    domain_internal: elephant.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf"
-    ip_address: "37.218.242.214"
-    port: 4422
   giraffe: 
     domain_full: giraffe.cdev.bitmask.net
     domain_internal: giraffe.cdev.bitmask.i
@@ -275,12 +259,6 @@ hosts:
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo="
     ip_address: "198.252.153.83"
     port: 4422
-  newt: 
-    domain_full: newt.dev.bitmask.net
-    domain_internal: newt.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf"
-    ip_address: "37.218.242.145"
-    port: 22
   orangutan: 
     aliases: 
       - api.singlenode.bitmask.net
@@ -297,12 +275,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6r51XEW9LjZVDZs3q/aIpn+oKo468ovivZIQPMmYMs6NUJ2z7Oc9YROAM3lfxcHHShNBIpxg/pSKnQ743hHavV3y+mEPbo4W3hbByuR6GJRaKxHP42NMfNxJUHpaix8jCrMkNypFGMss9C403quy62yGfN7hWIH/pWFR9z+GvWaLpl0J1T+sadeqYGrjiWPwmo88ZAo/RRsXEORyPMz/X7+pa+DvYrg9FqOnNNK0EvHI5asxRQMojpbt6DRpOkkDPkFZp/gpGRQCAbnaKtalkfC/HhbHepGiqQwMRphcpTmnJvOfIGy+YnUoV3RwoRzb5HAT6FkJ9c4gsTs+6Rp"
     ip_address: "46.165.242.166"
     port: 4422
-  snail: 
-    domain_full: snail.dev.bitmask.net
-    domain_internal: snail.dev.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf"
-    ip_address: "37.218.242.215"
-    port: 4422
   tuatara: 
     domain_full: tuatara.unstable.bitmask.net
     domain_internal: tuatara.unstable.bitmask.i
@@ -323,7 +295,6 @@ nagios:
     - bitmask.i
     - cdev.bitmask.i
     - demo.bitmask.i
-    - dev.bitmask.i
     - mail.bitmask.i
     - singlenode.bitmask.i
     - unstable.bitmask.i
@@ -338,9 +309,6 @@ nagios:
     demovpn: 
       contact_emails: 
         - sysdev@leap.se
-    development: 
-      contact_emails: 
-        - sysdev@leap.se
     production: 
       contact_emails: 
         - sysdev@leap.se
@@ -391,21 +359,11 @@ nagios:
       services: 
         - mx
       ssh_port: 22
-    clam: 
-      domain_full_suffix: dev.bitmask.net
-      domain_internal: clam.dev.bitmask.i
-      domain_internal_suffix: dev.bitmask.i
-      environment: development
-      ip_address: "37.218.242.213"
-      services: 
-        - couchdb
-        - soledad
-      ssh_port: 4422
     demodex: 
-      domain_full_suffix: dev.bitmask.net
-      domain_internal: demodex.dev.bitmask.i
-      domain_internal_suffix: dev.bitmask.i
-      environment: development
+      domain_full_suffix: unstable.bitmask.net
+      domain_internal: demodex.unstable.bitmask.i
+      domain_internal_suffix: unstable.bitmask.i
+      environment: unstable
       ip_address: "204.13.164.171"
       services: 
         - backup
@@ -429,15 +387,6 @@ nagios:
         - monitor
         - webapp
       ssh_port: 22
-    elephant: 
-      domain_full_suffix: dev.bitmask.net
-      domain_internal: elephant.dev.bitmask.i
-      domain_internal_suffix: dev.bitmask.i
-      environment: development
-      ip_address: "37.218.242.214"
-      services: 
-        - webapp
-      ssh_port: 4422
     giraffe: 
       domain_full_suffix: cdev.bitmask.net
       domain_internal: giraffe.cdev.bitmask.i
@@ -477,15 +426,6 @@ nagios:
       services: 
         - openvpn
       ssh_port: 4422
-    newt: 
-      domain_full_suffix: dev.bitmask.net
-      domain_internal: newt.dev.bitmask.i
-      domain_internal_suffix: dev.bitmask.i
-      environment: development
-      ip_address: "37.218.242.145"
-      services: 
-        - backup
-      ssh_port: 22
     orangutan: 
       domain_full_suffix: singlenode.bitmask.net
       domain_internal: orangutan.singlenode.bitmask.i
@@ -509,17 +449,6 @@ nagios:
         - openvpn
         - tor
       ssh_port: 4422
-    snail: 
-      domain_full_suffix: dev.bitmask.net
-      domain_internal: snail.dev.bitmask.i
-      domain_internal_suffix: dev.bitmask.i
-      environment: development
-      ip_address: "37.218.242.215"
-      openvpn_gateway_address: "37.218.242.216"
-      services: 
-        - mx
-        - openvpn
-      ssh_port: 4422
     tuatara: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: tuatara.unstable.bitmask.i
@@ -672,6 +601,7 @@ webapp:
       - "199.119.112.206"
       - "199.119.112.207"
       - "199.119.112.208"
+      - "204.13.164.171"
     monitor: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR
   api_version: 1
   billing: