removed bleeding and jessie env

2 files changed, 0 insertions, 60 deletions

diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 38e309a..21ee48c 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -66,8 +66,6 @@ mx:
   aliases: {}
   key_lookup_domain: unstable.bitmask.net
 mynetworks: 
-  - "1.209.122.24"
-  - "1.209.122.26"
   - "176.53.69.13"
   - "176.53.69.14"
   - "176.53.69.22"
@@ -82,7 +80,6 @@ mynetworks:
   - "199.119.112.152"
   - "199.119.112.153"
   - "199.119.112.167"
-  - "199.119.112.197"
   - "199.119.112.205"
   - "199.119.112.206"
   - "199.119.112.207"
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index aeb7b73..6a03039 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -201,12 +201,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2YO7JEh12id6zSoAyq8uc1IIVpGMrv/JaNAX74R+nNdcFnezB2fZXDHr+FHdNg6Jfsy3KPTmNObWD/+T0HHcZVsuLULSKs/Drl/iYnfS9nzEoj9a2uS/Z4/kWAeCaiD8UoyXcB/4vi9Kq+NujtH9qHUM+FQJ3XSbJJYNqXucvl6i4mpGYS9E0piJJ6Nly26+OKTc9rT8x23vYWBtO7RDw+Z0fbfJKCd7KIgZvxukxDj+N/V6GxoyaybkzepR92q98xqMhZAiiuVLGpgI09Wc3YuKYCvOfNj6JFrKpDo52qJ2zaZXUPwS84b1aWhfwG7JV/T8qYqx4X03wn9fm+Scl"
     ip_address: "199.119.112.167"
     port: 22
-  armadillo: 
-    domain_full: armadillo.bleeding.bitmask.net
-    domain_internal: armadillo.bleeding.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/9xQU1KwCniVCHjGP52c0WXkh6L+ZkRR4Wq30cNIN5V1fYzBb2GdVaMBLNT68XFJHG7OrhC3HGsXLkEGyiCyHSNsvrMFBD4L3rx9R/RK8ORfgiKcjRjs8KQ9kGqCNYLYuhLf6HzqDkM3TAtfehTlymHsQjYZX7z+UWryAdghQMG8vQ8XONelvQ7I3iiHGtcxsv0lG8t5WUs4JOpiGuf/zrnz8M93M1PUnoJLi23YfR9Hs/kVHL84jCaalZ6AHRLD07oEkGvyIJghc8c8VMvYSngNHfjAmXQWhk1+J2CknJ6orVYLtoC+G82HlrAeISA7o41pO106JHSVdi2wuL32X"
-    ip_address: "1.209.122.24"
-    port: 22
   cat: 
     domain_full: cat.unstable.bitmask.net
     domain_internal: cat.unstable.bitmask.i
@@ -267,12 +261,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD0UeOcj5frFsFK6CxTojMr9M/Fg3/3yBmsMtEP/wGiEZ1uTmbuYSzYUicashNPrQ3NnXEmLfmQbumKT1BL2p+EtN942poQSKA3sQWNemTErJcPr3vNN5vXXcXNoTDd8WmUOOnWMw5CkMv9kkgEN2jYfQNR1olofUn7eB5e9Iu24d4IaTupLzT+e3Jh+nkH5Uqw/JMmMkoy6nvYt9OmSQ+fvZZnuMatGSgOSpLgjajIvR115ga8QYEiQ76ugO+K+afvrSe5k8/puH+Xh0B5x1OlwxaGfIfYpi9IITdzMVvr/kEop7FG4184FehdlWS5DcUPZT5dicZLVlntelU+hlLb"
     ip_address: "199.119.112.153"
     port: 22
-  gorilla: 
-    domain_full: gorilla.bleeding.bitmask.net
-    domain_internal: gorilla.bleeding.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAvgagCu3wyJizByW+JMLGn0CcMIDSxBU0QdBqcu65DDKOyJvVWL2fSHEOu0xdVmQow7ecoirrJZqL6VzrFVp8ur1Rn7+IR2RdtADtel4dbi7Hr1PuvNTKuE/NsRtX3p+zZHEl6SkFBVIgInlfezQxyytyLzL5mCjUCIe74krHDrU9bLkIwet3V/33SHjNYvv4BZ0VxCjvioI6iallhTw0ysizNFrbt3gyOCmS64E9qZWzYhzYUz8lF6nGpjNuwFcqrnZ0UN9Pk9905YuVAjO9H9kAIEKQ+bqAY0va8jcVC7NRKv3n5E7JFbr4SzSoOLulmkVDPRimax2XEt1fA8vr"
-    ip_address: "1.209.122.26"
-    port: 22
   hippo: 
     domain_full: hippo.bitmask.net
     domain_internal: hippo.bitmask.i
@@ -303,12 +291,6 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtsIDPQkrOkbKZIhQEckY2uQKDXXN8/rQElMCwEbNuf25rz8ec5hSaMTOidjj0aAUSe33owu7fc5xvjbm2UY8zgpp3KMUlxwB27RPuegXrheA7HfZooXGwmlrBPgzUxHEDd3bp0KyNOOzabELQAxLEeACJSnKEKrwRXg4I4yDJpxZIHC79629804ScfaAI6aamqDnl5nMrr3eozjaWfrXGd/qyOYg+q7iw9HTK9rFR0tVuy4TFc/4doCqgJ4Dqx9jY1uewjA0xMAKb+8VqvmgC9GUHXye2Q4AXGFfrzjxsGpN8KkjwhiOCG/x2nxbhXJuq92w5t9+AyJzWSP6H1UOz"
     ip_address: "199.119.112.151"
     port: 22
-  quetzal: 
-    domain_full: quetzal.jessie.bitmask.net
-    domain_internal: quetzal.jessie.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqPePS18hnKkcLAxLqNAwM3QbDYpOT4LOpksDT45847vSFoSTFcj4Qd+aQr9pssTNBDTstKcjoLfzo+VTvlTOKd9vOBER1AvFSlNKGyLUGRg/1mdEpOMEbHGUaIimjwT59GdUC3R9dp0NCx5iWHb90MR1o2o4gMHXj5TEyJO2u7qIEMCRQslHiWpC6+qBWvs7coqpU65UrN4C/9thQv/9PibmFsmY3N3dKdxBrPfK+3Y52pMyD2DmbF408v0o6Py/W8kKjfhB2qjpkcUPU/OkpxWsdEy1lC+yI/s307ywkIWqG3oTPbzufKwS/ND80mBdRxXyMIU29aAg9PXeKWmWb"
-    ip_address: "199.119.112.197"
-    port: 22
   seahorse: 
     domain_full: seahorse.bitmask.net
     domain_internal: seahorse.bitmask.i
@@ -357,17 +339,12 @@ mail:
 nagios: 
   domains_internal: 
     - bitmask.i
-    - bleeding.bitmask.i
     - cdev.bitmask.i
     - demo.bitmask.i
     - dev.bitmask.i
-    - jessie.bitmask.i
     - mail.bitmask.i
     - unstable.bitmask.i
   environments: 
-    bleeding: 
-      contact_emails: 
-        - sysdev@leap.se
     clientdev: 
       contact_emails: 
         - drebs@leap.se
@@ -383,9 +360,6 @@ nagios:
     disabled: 
       contact_emails: 
         - sysdev@leap.se
-    jessie: 
-      contact_emails: 
-        - sysdev@leap.se
     mail: 
       contact_emails: 
         - sysdev@leap.se
@@ -427,15 +401,6 @@ nagios:
         - soledad
         - webapp
       ssh_port: 22
-    armadillo: 
-      domain_full_suffix: bleeding.bitmask.net
-      domain_internal: armadillo.bleeding.bitmask.i
-      domain_internal_suffix: bleeding.bitmask.i
-      environment: bleeding
-      ip_address: "1.209.122.24"
-      services: 
-        - couchdb
-      ssh_port: 22
     cat: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: cat.unstable.bitmask.i
@@ -530,15 +495,6 @@ nagios:
         - couchdb
         - soledad
       ssh_port: 22
-    gorilla: 
-      domain_full_suffix: bleeding.bitmask.net
-      domain_internal: gorilla.bleeding.bitmask.i
-      domain_internal_suffix: bleeding.bitmask.i
-      environment: bleeding
-      ip_address: "1.209.122.26"
-      services: 
-        - couchdb
-      ssh_port: 22
     hippo: 
       domain_full_suffix: bitmask.net
       domain_internal: hippo.bitmask.i
@@ -586,19 +542,6 @@ nagios:
       services: 
         - webapp
       ssh_port: 22
-    quetzal: 
-      domain_full_suffix: jessie.bitmask.net
-      domain_internal: quetzal.jessie.bitmask.i
-      domain_internal_suffix: jessie.bitmask.i
-      environment: jessie
-      ip_address: "199.119.112.197"
-      services: 
-        - couchdb
-        - mx
-        - pixelated
-        - soledad
-        - webapp
-      ssh_port: 22
     seahorse: 
       domain_full_suffix: bitmask.net
       domain_internal: seahorse.bitmask.i