Merge branch 'master' of ssh://leap.se/bitmask

13 files changed, 80 insertions, 36 deletions

diff --git a/provider/files/nodes/ca1_vagrant/ca1_vagrant_ssh.pub b/provider/files/nodes/ca1_vagrant/ca1_vagrant_ssh.pub
index 59d2da0..1188e5e 100644
--- a/provider/files/nodes/ca1_vagrant/ca1_vagrant_ssh.pub
+++ b/provider/files/nodes/ca1_vagrant/ca1_vagrant_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
\ No newline at end of file
diff --git a/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub b/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub
index 59d2da0..1188e5e 100644
--- a/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub
+++ b/provider/files/nodes/couchdb1_vagrant/couchdb1_vagrant_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
\ No newline at end of file
diff --git a/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub b/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub
index 59d2da0..1188e5e 100644
--- a/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub
+++ b/provider/files/nodes/vpn1_vagrant/vpn1_vagrant_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
\ No newline at end of file
diff --git a/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub b/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub
index 59d2da0..1188e5e 100644
--- a/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub
+++ b/provider/files/nodes/web1_vagrant/web1_vagrant_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
\ No newline at end of file
diff --git a/provider/files/ssh/known_hosts b/provider/files/ssh/known_hosts
index d90e74d..6575892 100644
--- a/provider/files/ssh/known_hosts
+++ b/provider/files/ssh/known_hosts
@@ -1,8 +1,8 @@
 aligator,aligator.bitmask.i,aligator.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
-ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
-couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
+ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
 koala,koala.bitmask.i,koala.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX
 sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
 turtle,turtle.bitmask.i,turtle.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDECAk6ImmnzRsorqoeU7kCpMClhLu80q5AJw1cfZlZMx4PEq0tMnRu2Q0jtGSQwBqU2OzUK+WXljx+5mF/mnJXtAO+/+usQFFzYiovT/7cjEAtYzlcECkqF0TajEIdCcqPoO0GJHpbhenlCfhnan9d3uJWIghI0DioNgeF+Prxw2eqA9UnyeJ+EefWMeo5e6DPjYohFTy/Jg4wpMqbFh/IfKqtp2/6fuz1ssaajePiAt4dVtzCttc8t68oJWr9scnDdlqyr4i7hQSizZiSRCgVwu94WCx2DJsMaxNUY7J9VzgR7T4ja/8TjnHLVMO+dd36A4F0yXVSo7WBZ0AqEsA9
-vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
-web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f
+vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
diff --git a/provider/hiera/aligator.yaml b/provider/hiera/aligator.yaml
index 50c0aad..cdf6aad 100644
--- a/provider/hiera/aligator.yaml
+++ b/provider/hiera/aligator.yaml
@@ -7,7 +7,6 @@ domain:
   internal: aligator.bitmask.i
   internal_suffix: bitmask.i
   name: aligator.bitmask.net
-hosts: ~
 interface: eth0
 ip_address: "176.53.69.120"
 local: false
@@ -35,7 +34,15 @@ ssh:
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
-  known_hosts: ~
+  known_hosts: |
+      aligator,aligator.bitmask.i,aligator.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
+      ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      koala,koala.bitmask.i,koala.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX
+      sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
+      turtle,turtle.bitmask.i,turtle.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDECAk6ImmnzRsorqoeU7kCpMClhLu80q5AJw1cfZlZMx4PEq0tMnRu2Q0jtGSQwBqU2OzUK+WXljx+5mF/mnJXtAO+/+usQFFzYiovT/7cjEAtYzlcECkqF0TajEIdCcqPoO0GJHpbhenlCfhnan9d3uJWIghI0DioNgeF+Prxw2eqA9UnyeJ+EefWMeo5e6DPjYohFTy/Jg4wpMqbFh/IfKqtp2/6fuz1ssaajePiAt4dVtzCttc8t68oJWr9scnDdlqyr4i7hQSizZiSRCgVwu94WCx2DJsMaxNUY7J9VzgR7T4ja/8TjnHLVMO+dd36A4F0yXVSo7WBZ0AqEsA9
+      vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
   port: 4422
 tags: 
   - production
diff --git a/provider/hiera/ca1_vagrant.yaml b/provider/hiera/ca1_vagrant.yaml
index 3c14f0e..7a8329f 100644
--- a/provider/hiera/ca1_vagrant.yaml
+++ b/provider/hiera/ca1_vagrant.yaml
@@ -1,10 +1,4 @@
 --- 
-ca_daemon: 
-  couchdb_hosts: 
-    - couchdb1_vagrant.bitmask.i
-  couchdb_user: 
-    password: nFdNr2AYEKTwLe_tcFdFKN_vVBsWagvd
-    username: ca_daemon
 dns: 
   public: false
 domain: 
@@ -13,7 +7,6 @@ domain:
   internal: ca1_vagrant.bitmask.i
   internal_suffix: bitmask.i
   name: ca1_vagrant.bitmask.i
-hosts: "10.5.5.44    couchdb1_vagrant couchdb1_vagrant.bitmask.i couchdb1_vagrant.bitmask.net"
 interface: eth0
 ip_address: "10.5.5.48"
 local: true
@@ -26,7 +19,15 @@ ssh:
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
-  known_hosts: "couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f"
+  known_hosts: |
+      aligator,aligator.bitmask.i,aligator.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
+      ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      koala,koala.bitmask.i,koala.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX
+      sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
+      turtle,turtle.bitmask.i,turtle.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDECAk6ImmnzRsorqoeU7kCpMClhLu80q5AJw1cfZlZMx4PEq0tMnRu2Q0jtGSQwBqU2OzUK+WXljx+5mF/mnJXtAO+/+usQFFzYiovT/7cjEAtYzlcECkqF0TajEIdCcqPoO0GJHpbhenlCfhnan9d3uJWIghI0DioNgeF+Prxw2eqA9UnyeJ+EefWMeo5e6DPjYohFTy/Jg4wpMqbFh/IfKqtp2/6fuz1ssaajePiAt4dVtzCttc8t68oJWr9scnDdlqyr4i7hQSizZiSRCgVwu94WCx2DJsMaxNUY7J9VzgR7T4ja/8TjnHLVMO+dd36A4F0yXVSo7WBZ0AqEsA9
+      vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
   port: 22
 tags: 
   - local
diff --git a/provider/hiera/couchdb1_vagrant.yaml b/provider/hiera/couchdb1_vagrant.yaml
index 85271da..b5c3534 100644
--- a/provider/hiera/couchdb1_vagrant.yaml
+++ b/provider/hiera/couchdb1_vagrant.yaml
@@ -18,7 +18,6 @@ domain:
   internal: couchdb1_vagrant.bitmask.i
   internal_suffix: bitmask.i
   name: couchdb1_vagrant.bitmask.i
-hosts: ~
 ip_address: "10.5.5.44"
 local: true
 name: couchdb1_vagrant
@@ -30,7 +29,15 @@ ssh:
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
-  known_hosts: ~
+  known_hosts: |
+      aligator,aligator.bitmask.i,aligator.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
+      ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      koala,koala.bitmask.i,koala.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX
+      sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
+      turtle,turtle.bitmask.i,turtle.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDECAk6ImmnzRsorqoeU7kCpMClhLu80q5AJw1cfZlZMx4PEq0tMnRu2Q0jtGSQwBqU2OzUK+WXljx+5mF/mnJXtAO+/+usQFFzYiovT/7cjEAtYzlcECkqF0TajEIdCcqPoO0GJHpbhenlCfhnan9d3uJWIghI0DioNgeF+Prxw2eqA9UnyeJ+EefWMeo5e6DPjYohFTy/Jg4wpMqbFh/IfKqtp2/6fuz1ssaajePiAt4dVtzCttc8t68oJWr9scnDdlqyr4i7hQSizZiSRCgVwu94WCx2DJsMaxNUY7J9VzgR7T4ja/8TjnHLVMO+dd36A4F0yXVSo7WBZ0AqEsA9
+      vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
   port: 22
 tags: 
   - local
diff --git a/provider/hiera/koala.yaml b/provider/hiera/koala.yaml
index bbb4343..f61f98d 100644
--- a/provider/hiera/koala.yaml
+++ b/provider/hiera/koala.yaml
@@ -1,10 +1,4 @@
 --- 
-ca_daemon: 
-  couchdb_hosts: 
-    - sloth.bitmask.i
-  couchdb_user: 
-    password: nFdNr2AYEKTwLe_tcFdFKN_vVBsWagvd
-    username: ca_daemon
 dns: 
   public: false
 domain: 
@@ -13,7 +7,6 @@ domain:
   internal: koala.bitmask.i
   internal_suffix: bitmask.i
   name: koala.bitmask.i
-hosts: "176.53.69.122    sloth sloth.bitmask.i sloth.bitmask.net"
 interface: eth0
 ip_address: "176.53.69.125"
 local: false
@@ -27,7 +20,15 @@ ssh:
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
-  known_hosts: "sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B"
+  known_hosts: |
+      aligator,aligator.bitmask.i,aligator.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
+      ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      koala,koala.bitmask.i,koala.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX
+      sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
+      turtle,turtle.bitmask.i,turtle.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDECAk6ImmnzRsorqoeU7kCpMClhLu80q5AJw1cfZlZMx4PEq0tMnRu2Q0jtGSQwBqU2OzUK+WXljx+5mF/mnJXtAO+/+usQFFzYiovT/7cjEAtYzlcECkqF0TajEIdCcqPoO0GJHpbhenlCfhnan9d3uJWIghI0DioNgeF+Prxw2eqA9UnyeJ+EefWMeo5e6DPjYohFTy/Jg4wpMqbFh/IfKqtp2/6fuz1ssaajePiAt4dVtzCttc8t68oJWr9scnDdlqyr4i7hQSizZiSRCgVwu94WCx2DJsMaxNUY7J9VzgR7T4ja/8TjnHLVMO+dd36A4F0yXVSo7WBZ0AqEsA9
+      vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
   port: 4422
 tags: 
   - production
diff --git a/provider/hiera/sloth.yaml b/provider/hiera/sloth.yaml
index c2231cf..67df2c7 100644
--- a/provider/hiera/sloth.yaml
+++ b/provider/hiera/sloth.yaml
@@ -18,7 +18,6 @@ domain:
   internal: sloth.bitmask.i
   internal_suffix: bitmask.i
   name: sloth.bitmask.i
-hosts: ~
 ip_address: "176.53.69.122"
 local: false
 name: sloth
@@ -31,7 +30,15 @@ ssh:
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
-  known_hosts: ~
+  known_hosts: |
+      aligator,aligator.bitmask.i,aligator.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
+      ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      koala,koala.bitmask.i,koala.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX
+      sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
+      turtle,turtle.bitmask.i,turtle.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDECAk6ImmnzRsorqoeU7kCpMClhLu80q5AJw1cfZlZMx4PEq0tMnRu2Q0jtGSQwBqU2OzUK+WXljx+5mF/mnJXtAO+/+usQFFzYiovT/7cjEAtYzlcECkqF0TajEIdCcqPoO0GJHpbhenlCfhnan9d3uJWIghI0DioNgeF+Prxw2eqA9UnyeJ+EefWMeo5e6DPjYohFTy/Jg4wpMqbFh/IfKqtp2/6fuz1ssaajePiAt4dVtzCttc8t68oJWr9scnDdlqyr4i7hQSizZiSRCgVwu94WCx2DJsMaxNUY7J9VzgR7T4ja/8TjnHLVMO+dd36A4F0yXVSo7WBZ0AqEsA9
+      vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
   port: 4422
 tags: 
   - production
diff --git a/provider/hiera/turtle.yaml b/provider/hiera/turtle.yaml
index 33f5eb3..84c5e55 100644
--- a/provider/hiera/turtle.yaml
+++ b/provider/hiera/turtle.yaml
@@ -77,7 +77,6 @@ domain:
   internal: turtle.bitmask.i
   internal_suffix: bitmask.i
   name: turtle.bitmask.net
-hosts: "176.53.69.122    sloth sloth.bitmask.i sloth.bitmask.net"
 ip_address: "176.53.69.119"
 local: false
 name: turtle
@@ -90,7 +89,15 @@ ssh:
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
-  known_hosts: "sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B"
+  known_hosts: |
+      aligator,aligator.bitmask.i,aligator.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
+      ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      koala,koala.bitmask.i,koala.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX
+      sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
+      turtle,turtle.bitmask.i,turtle.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDECAk6ImmnzRsorqoeU7kCpMClhLu80q5AJw1cfZlZMx4PEq0tMnRu2Q0jtGSQwBqU2OzUK+WXljx+5mF/mnJXtAO+/+usQFFzYiovT/7cjEAtYzlcECkqF0TajEIdCcqPoO0GJHpbhenlCfhnan9d3uJWIghI0DioNgeF+Prxw2eqA9UnyeJ+EefWMeo5e6DPjYohFTy/Jg4wpMqbFh/IfKqtp2/6fuz1ssaajePiAt4dVtzCttc8t68oJWr9scnDdlqyr4i7hQSizZiSRCgVwu94WCx2DJsMaxNUY7J9VzgR7T4ja/8TjnHLVMO+dd36A4F0yXVSo7WBZ0AqEsA9
+      vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
   port: 22
 tags: 
   - production
diff --git a/provider/hiera/vpn1_vagrant.yaml b/provider/hiera/vpn1_vagrant.yaml
index 2d1b38c..bf112c4 100644
--- a/provider/hiera/vpn1_vagrant.yaml
+++ b/provider/hiera/vpn1_vagrant.yaml
@@ -7,7 +7,6 @@ domain:
   internal: vpn1_vagrant.bitmask.i
   internal_suffix: bitmask.i
   name: vpn1_vagrant.bitmask.net
-hosts: ~
 interface: eth0
 ip_address: "10.5.5.45"
 local: true
@@ -34,7 +33,15 @@ ssh:
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
-  known_hosts: ~
+  known_hosts: |
+      aligator,aligator.bitmask.i,aligator.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
+      ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      koala,koala.bitmask.i,koala.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX
+      sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
+      turtle,turtle.bitmask.i,turtle.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDECAk6ImmnzRsorqoeU7kCpMClhLu80q5AJw1cfZlZMx4PEq0tMnRu2Q0jtGSQwBqU2OzUK+WXljx+5mF/mnJXtAO+/+usQFFzYiovT/7cjEAtYzlcECkqF0TajEIdCcqPoO0GJHpbhenlCfhnan9d3uJWIghI0DioNgeF+Prxw2eqA9UnyeJ+EefWMeo5e6DPjYohFTy/Jg4wpMqbFh/IfKqtp2/6fuz1ssaajePiAt4dVtzCttc8t68oJWr9scnDdlqyr4i7hQSizZiSRCgVwu94WCx2DJsMaxNUY7J9VzgR7T4ja/8TjnHLVMO+dd36A4F0yXVSo7WBZ0AqEsA9
+      vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
   port: 22
 tags: 
   - local
diff --git a/provider/hiera/web1_vagrant.yaml b/provider/hiera/web1_vagrant.yaml
index dba6ea5..36f2275 100644
--- a/provider/hiera/web1_vagrant.yaml
+++ b/provider/hiera/web1_vagrant.yaml
@@ -77,7 +77,6 @@ domain:
   internal: web1_vagrant.bitmask.i
   internal_suffix: bitmask.i
   name: web1_vagrant.bitmask.net
-hosts: "10.5.5.44    couchdb1_vagrant couchdb1_vagrant.bitmask.i couchdb1_vagrant.bitmask.net"
 ip_address: "10.5.5.47"
 local: true
 name: web1_vagrant
@@ -89,7 +88,15 @@ ssh:
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ== users/elijah/elijah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1lHzO6il/4+V+KSiJZy34mxBKJNrn9Ah7VBxa3ss4AnahDgVwYqGlLk8xe45CShLRlu3nP4ccX06LUCJOBuLI2QZccR6+h2jfIEjXIaNC8lp12thIriEPUWZaKwV04fnhOnpA/VzNCRri8DOCuNvA8pfjg51DUtvhEuIV9UNxHCsLFSNg8RPngqNxrDgZJvjIMFFdTyOl0OdE1sN1zG2A6UPTlqO7Tmt6+/AByAS/C519nL0MIDix1S93sqaxaIE4kZSmVVx7Ft/albzWSIhIF/UbLxqfkc6L0HV0OpvBPMMuYUZkLC3DfAMggkxJsTTHkcR2Z1fIQ3P9am75WSwGw== users/micah/micah_ssh.pub
       ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8= users/varac/varac_ssh.pub
-  known_hosts: "couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgLuvjtm2bVB7Q1vNSthCNkQlVZB4HoOcXBxmFHsz6CX4TuUXlSdkfSoD4h51rRpR74OO7CiXRpBxlMCgbnZia4gT6Bo2DzXHNUbaG5zeAR8olAE0w2+Co8Ny+uP6lOSnJEuMzV7B98ASYRsXCiDZ7hPcJQ3025HUXt4M/BDAnw0fisfUu0ihY9ghAnWGqfQbbTY3Xoeo0Jzx7AJ/KUvwgkMg/j9D5Mz4/C8SniIhOBI8n+uvmwW/O1DO2MGD71j+cMWEforGD76Gbqs0inLhvUJIkMZCfLUcVrtZQs6srLT5zyqXxqSZC9vWkRT5D1kgeNeC4gzDf0v3hVCuQME8f"
+  known_hosts: |
+      aligator,aligator.bitmask.i,aligator.bitmask.net,176.53.69.120 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfbN1Tcf01Uu6pGIzTh7E/BVKDoO1sen85cWTcZMmm058YA9n+mPP4hI24//ZW/zpGNI4d7YKtKt6r3ao9dUhbkSWnnKRgMD1MFyq/GN7EnKwR2oWaGOPZ1Lllg6nPcMktCdUStm8Y7GPTw6SYpm7cH/lUd+6fozCLS9ZnujWNYnkYTMX5bN9SKVmYy/+P36M/P9oa5HqRUZDfMtj6ottkXYnTLtWlabbn98l2wgxKy6AHJJvdp3LVbln5G7vR/P21zhR178G2XdMTeCmMRF3H3/Y2Eiai6ArnylQre3s9UTUB3+uBEtI4zBbZNcbzzDpbZyHxue+12zzNYRV++pCv
+      ca1_vagrant,ca1_vagrant.bitmask.i,ca1_vagrant.bitmask.net,10.5.5.48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      couchdb1_vagrant,couchdb1_vagrant.bitmask.i,couchdb1_vagrant.bitmask.net,10.5.5.44 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      koala,koala.bitmask.i,koala.bitmask.net,176.53.69.125 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+F/OOIZbQbK7/n6nnijHkYs2qjZzqYXyXUSyIDdA8GOg2g4p89YRvbLSkZ9BLl5x4zgyT3nIw6bee5ADErT266VKcvcYdKzMQ6ws+ZcV5Pa3jL3cmzsIossZBGnP8Q+MmjKP+2uFH0NXkAIABy8Wack/FHuIPWdcBrW61q6FX6788NEmYU2sQHble/K2rg1a5aLZm0HStsJhJL0y13jcw5NhhMVcGREqga6MgQ6iAOJYjbJBQnramOqpPavkUSyvgI68GZqevrFzgCkUCiv9cmIAnZEvOo0MIwmWQlUldHIi6lr9vRt9aqmAq0zuUlpxYk3zL9Q2EiaScgEE1XIkX
+      sloth,sloth.bitmask.i,sloth.bitmask.net,176.53.69.122 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTZd7IQRQ0cryvj/7cif4PNOlsLjgcfFmCT0o477MOkds5bI4XVBfqjhtMpgEg92uIBrlU/zB0wHpviS6XLryF2CYODJDk+oHOPcoc+3uox5L9ODJRnWVl/LgBPSSPCw7XwTfrDIReBQ2E60ngpgekEjcZM6Qq4Z6jeG8A74sdviQCqVZ+hiVF0CVkRrmtMi7ucb48+5VxYNVkoc/b5GvkDNgPxCoddUhdRPXFr/tOWK77/3I5lsO+OnNd4ptbszmI3Uzidb02LGWU7CHIrSgBj8uAVyU8dtNV+L+quzlMxr13GBeTuYiu89/OjU9D9eoG5GBA5YRYY//BBpzd/F6B
+      turtle,turtle.bitmask.i,turtle.bitmask.net,176.53.69.119 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDECAk6ImmnzRsorqoeU7kCpMClhLu80q5AJw1cfZlZMx4PEq0tMnRu2Q0jtGSQwBqU2OzUK+WXljx+5mF/mnJXtAO+/+usQFFzYiovT/7cjEAtYzlcECkqF0TajEIdCcqPoO0GJHpbhenlCfhnan9d3uJWIghI0DioNgeF+Prxw2eqA9UnyeJ+EefWMeo5e6DPjYohFTy/Jg4wpMqbFh/IfKqtp2/6fuz1ssaajePiAt4dVtzCttc8t68oJWr9scnDdlqyr4i7hQSizZiSRCgVwu94WCx2DJsMaxNUY7J9VzgR7T4ja/8TjnHLVMO+dd36A4F0yXVSo7WBZ0AqEsA9
+      vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
+      web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl2NZUlwzepzBW+L1V474sVjNyW8DXdo736DCpLR6UlUMbyPo3KCSDsrSG4tc39PaQR3OstScRoBMYWNVoYgLRPTzdMiwj759TDv+GwMi8V+8hRs795LOQb6FZ21TROxsp3JqZFo7vVvlRNvKNpq6dQUQ50Hq77uxyD9qm3zshHuOWQWq7fI9aunFAVUuvBfVuM1XQhgJ6FJ36CJvcgKEc9ogKGUY7THHtVU2SR3hizzq5BjWUbvw0pYNBD3aWJJZdZkAdgQwz4ThxDJc6xPM7ic8jVzzxNMDdi59M8yxmIK0CBJyf7mwg9CWtJA9jDMgHgJiRoIeMrW6FT5Un3FT9
   port: 22
 tags: 
   - local