update hiera

5 files changed, 50 insertions, 50 deletions

diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index f1f69a7..e16b373 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -65,9 +65,9 @@ mynetworks:
   - "199.119.112.147"
   - "199.119.112.149"
   - "199.119.112.150"
-  - "199.119.112.19"
-  - "199.119.112.4"
-  - "199.119.112.5"
+  - "199.119.112.151"
+  - "199.119.112.152"
+  - "199.119.112.153"
   - "199.119.112.8"
   - "202.85.233.34"
   - "204.13.164.162"
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 06a62e6..3ca9395 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -179,30 +179,24 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/9xQU1KwCniVCHjGP52c0WXkh6L+ZkRR4Wq30cNIN5V1fYzBb2GdVaMBLNT68XFJHG7OrhC3HGsXLkEGyiCyHSNsvrMFBD4L3rx9R/RK8ORfgiKcjRjs8KQ9kGqCNYLYuhLf6HzqDkM3TAtfehTlymHsQjYZX7z+UWryAdghQMG8vQ8XONelvQ7I3iiHGtcxsv0lG8t5WUs4JOpiGuf/zrnz8M93M1PUnoJLi23YfR9Hs/kVHL84jCaalZ6AHRLD07oEkGvyIJghc8c8VMvYSngNHfjAmXQWhk1+J2CknJ6orVYLtoC+G82HlrAeISA7o41pO106JHSVdi2wuL32X"
     ip_address: "1.209.122.24"
     port: 22
-  canvasback: 
-    domain_full: canvasback.cdev.bitmask.net
-    domain_internal: canvasback.cdev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBH5g/h43gZ3pQsU8ohme4J2mDeZgxGnd3lfR428GRqxKH4MEDGGrimpK1oPf6scey+oD8WYvSYP3ZjPFZHxyq4A="
-    ip_address: "199.119.112.4"
-    port: 22
   cat: 
     domain_full: cat.unstable.bitmask.net
     domain_internal: cat.unstable.bitmask.i
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiGuqt+UfwqRvJdL6vioX8+oyRnZZKZ8uPKbMRmT7uR7z15Ox4QpNpW2aOTJ8Dwy4jPo5icEkYeGxXNdJMuooIxc1SgcaTpyh/epVGNV/K409t9KAi057eEMgp75dKi7f8kq+jvXeK1+ZdT6DvxvHQVMkKi0KeT8rw2F2Vdqh2upGiHtjLDXtF2ySLjwJ3gxqVjvsfDUxIYdBabK3eLuRINXwGKnJHmKO6MqQR4dOlOPG+3EdgVunWmVSA+1Uo8EZU6kbJ9T5MbpEDAV9K0R1HgdB2UTu/agFOVOYKylROcNzu2nES9qCat6/THK8lCVKBDywjpoQZ9vqSH9oFwond"
     ip_address: "199.119.112.123"
     port: 22
-  chipmonk: 
-    domain_full: chipmonk.cdev.bitmask.net
-    domain_internal: chipmonk.cdev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDyqIb8/kigC0IUCVFlIKmhp5+C/P2W7d71jMX6ZK9XAzRzxFdMmcvn5H6ypUsLWQ7r327nD1bRupKiYdmPWrWk="
-    ip_address: "199.119.112.19"
-    port: 22
   clam: 
     domain_full: clam.dev.bitmask.net
     domain_internal: clam.dev.bitmask.i
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCd44smDJpmCINOnmZdyJO4x/kfziCi/UZiPMplCZN3RLEj8/eqhTo/imXNYXvx8AlwMIUsvVs4D79ukFPqICn7CF5xPuOuz+Og+Dk1rpD68Jomws13N194nOisDHlXwxmQCdFd2w+0FENd+tUmrx7AM1eQmg6D2WRw+Hmb17C7fdJwlCXz8bfTWnEWDvpwgVchpszy3WwX9Ul01j7IH3yKEM4c9GwWjJ8LgJfI1jR1jKnD6xZxuqbQ7aRoer2b6PIrIfsTB/JpuI9FtbjMuGCBusFf2+5lP/bsXeLGWU5smgGyjGNwa9ceUrhklNyXBQMz3wlBwXe4Q8u1LmM5Yi0Z"
     ip_address: "176.53.69.22"
     port: 4422
+  cowbird: 
+    domain_full: cowbird.cdev.bitmask.net
+    domain_internal: cowbird.cdev.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCraaEPNaV43AZ2N0zlxwnGzaqsSU+sBtz3PlId1NZqYv27UYIXw1WKPPhLbdfcVQxM0pVSsTZ8hsfztGrRn9yW1JNzp59GjRxenOzCVen08YLlY9eKEI3UNB8nMh4HuVWxQGOiaqovCN3e0KcwImD7J35eOW14NCQ8zvzVHwIL/VhO+wpQ6ofJ0pFP78w/EZ/arbHIM4teWyRGJzcBe++kFqWoaj8Yxbdgo2ZW4iyqCwpaxLk7KHM2op/FSwrEs/cnlwyCq+xjP3QLjDT2TRgwEQycTGABhcqrJJ1SVo4sKE0DvjhVHsAy5OI296k7OE5pbGXn2ZUc2TsPUttdUajt"
+    ip_address: "199.119.112.152"
+    port: 22
   deer: 
     domain_full: deer.dev.bitmask.net
     domain_internal: deer.dev.bitmask.i
@@ -239,11 +233,11 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/jTfvvn8rS730j0VIlgHWUMeUHgtIPFLutHJfwH8HwGl27Osnn2DbK2SWGYkts9XymrLho3InFfF4PotdgecrMFFkRnvnPz/ZbQ1NqYRWcwAYbN7Za8+2zSpxpG9qNEQrcU+nE7OvMgNZZBDz5C3ConxYTUO3nyyEgw/gAS7hz4d2jwN9KoB+w10Si9yd6CAra43/h+371ABAoHkmcUfi1WJKHlxFv29J6ODlwrd4Zr1K5lCl8+m/1QM04RXxInmHGO3foFpH4qY3LaHcYr7xnmmPMRYIbJfZmOXgckgj65Gc+jFUuNj+B+fIzI7Jy4O/hpG+JPT/3XcINjakZFZb"
     ip_address: "199.119.112.149"
     port: 22
-  gadwall: 
-    domain_full: gadwall.cdev.bitmask.net
-    domain_internal: gadwall.cdev.bitmask.i
-    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC4ycn7GabjeeewBmzTUbH+rZjRQV9seFmqbW2o5cE4jLsbPIMcMRRwLhA7TfIRLL7bLyuRNUWXwOqKZb/Psiog="
-    ip_address: "199.119.112.5"
+  goldeneye: 
+    domain_full: goldeneye.cdev.bitmask.net
+    domain_internal: goldeneye.cdev.bitmask.i
+    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
@@ -281,6 +275,12 @@ 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
+  ovenbird: 
+    domain_full: ovenbird.cdev.bitmask.net
+    domain_internal: ovenbird.cdev.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtsIDPQkrOkbKZIhQEckY2uQKDXXN8/rQElMCwEbNuf25rz8ec5hSaMTOidjj0aAUSe33owu7fc5xvjbm2UY8zgpp3KMUlxwB27RPuegXrheA7HfZooXGwmlrBPgzUxHEDd3bp0KyNOOzabELQAxLEeACJSnKEKrwRXg4I4yDJpxZIHC79629804ScfaAI6aamqDnl5nMrr3eozjaWfrXGd/qyOYg+q7iw9HTK9rFR0tVuy4TFc/4doCqgJ4Dqx9jY1uewjA0xMAKb+8VqvmgC9GUHXye2Q4AXGFfrzjxsGpN8KkjwhiOCG/x2nxbhXJuq92w5t9+AyJzWSP6H1UOz"
+    ip_address: "199.119.112.151"
+    port: 22
   seahorse: 
     domain_full: seahorse.bitmask.net
     domain_internal: seahorse.bitmask.i
@@ -388,15 +388,6 @@ nagios:
       services: 
         - couchdb
       ssh_port: 22
-    canvasback: 
-      domain_full_suffix: cdev.bitmask.net
-      domain_internal: canvasback.cdev.bitmask.i
-      domain_internal_suffix: cdev.bitmask.i
-      environment: clientdev
-      ip_address: "199.119.112.4"
-      services: 
-        - webapp
-      ssh_port: 22
     cat: 
       domain_full_suffix: unstable.bitmask.net
       domain_internal: cat.unstable.bitmask.i
@@ -406,15 +397,6 @@ nagios:
       services: 
         - mx
       ssh_port: 22
-    chipmonk: 
-      domain_full_suffix: cdev.bitmask.net
-      domain_internal: chipmonk.cdev.bitmask.i
-      domain_internal_suffix: cdev.bitmask.i
-      environment: clientdev
-      ip_address: "199.119.112.19"
-      services: 
-        - mx
-      ssh_port: 22
     clam: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: clam.dev.bitmask.i
@@ -425,6 +407,15 @@ nagios:
         - couchdb
         - soledad
       ssh_port: 4422
+    cowbird: 
+      domain_full_suffix: cdev.bitmask.net
+      domain_internal: cowbird.cdev.bitmask.i
+      domain_internal_suffix: cdev.bitmask.i
+      environment: clientdev
+      ip_address: "199.119.112.152"
+      services: 
+        - mx
+      ssh_port: 22
     deer: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: deer.dev.bitmask.i
@@ -480,12 +471,12 @@ nagios:
       services: 
         - backup
       ssh_port: 22
-    gadwall: 
+    goldeneye: 
       domain_full_suffix: cdev.bitmask.net
-      domain_internal: gadwall.cdev.bitmask.i
+      domain_internal: goldeneye.cdev.bitmask.i
       domain_internal_suffix: cdev.bitmask.i
       environment: clientdev
-      ip_address: "199.119.112.5"
+      ip_address: "199.119.112.153"
       services: 
         - couchdb
         - soledad
@@ -548,6 +539,15 @@ nagios:
         - openvpn
         - tor
       ssh_port: 4422
+    ovenbird: 
+      domain_full_suffix: cdev.bitmask.net
+      domain_internal: ovenbird.cdev.bitmask.i
+      domain_internal_suffix: cdev.bitmask.i
+      environment: clientdev
+      ip_address: "199.119.112.151"
+      services: 
+        - webapp
+      ssh_port: 22
     seahorse: 
       domain_full_suffix: bitmask.net
       domain_internal: seahorse.bitmask.i
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index a2c7751..6ef6273 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -78,9 +78,9 @@ mynetworks:
   - "199.119.112.147"
   - "199.119.112.149"
   - "199.119.112.150"
-  - "199.119.112.19"
-  - "199.119.112.4"
-  - "199.119.112.5"
+  - "199.119.112.151"
+  - "199.119.112.152"
+  - "199.119.112.153"
   - "199.119.112.8"
   - "202.85.233.34"
   - "204.13.164.162"
diff --git a/hiera/mx1.yaml b/hiera/mx1.yaml
index 3d46ced..133ad8a 100644
--- a/hiera/mx1.yaml
+++ b/hiera/mx1.yaml
@@ -70,9 +70,9 @@ mynetworks:
   - "199.119.112.147"
   - "199.119.112.149"
   - "199.119.112.150"
-  - "199.119.112.19"
-  - "199.119.112.4"
-  - "199.119.112.5"
+  - "199.119.112.151"
+  - "199.119.112.152"
+  - "199.119.112.153"
   - "199.119.112.8"
   - "202.85.233.34"
   - "204.13.164.162"
diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml
index 95ddf56..6cb1cb0 100644
--- a/hiera/starfish.yaml
+++ b/hiera/starfish.yaml
@@ -66,9 +66,9 @@ mynetworks:
   - "199.119.112.147"
   - "199.119.112.149"
   - "199.119.112.150"
-  - "199.119.112.19"
-  - "199.119.112.4"
-  - "199.119.112.5"
+  - "199.119.112.151"
+  - "199.119.112.152"
+  - "199.119.112.153"
   - "199.119.112.8"
   - "202.85.233.34"
   - "204.13.164.162"