removed koala from unstable.bm so we only have one couch node

8 files changed, 7 insertions, 162 deletions

diff --git a/files/nodes/koala/koala.crt b/files/nodes/koala/koala.crt
deleted file mode 100644
index c85ceb0..0000000
--- a/files/nodes/koala/koala.crt
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-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
------END CERTIFICATE-----
diff --git a/files/nodes/koala/koala.key b/files/nodes/koala/koala.key
deleted file mode 100644
index 118036a..0000000
--- a/files/nodes/koala/koala.key
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----
diff --git a/files/nodes/koala/koala_ssh.pub b/files/nodes/koala/koala_ssh.pub
deleted file mode 100644
index d0e1588..0000000
--- a/files/nodes/koala/koala_ssh.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/vYiNb13aZ+qPxrJlCTioJ6km/qhmlXqXID+gINmACVLq+67lfhDhK6ecr4wHpPnItzYpL+VCd/3SW51cZn7tKog2i3o4ZosajyKxj6AgPDOXGot3CKJzTwTuVvqfZWFnFEz9EOPjEFhuN/P+11qkqWcYnv1nezkiPIMxlwDtIu1zdFBoTA9xVLhmtotkVmlne0Lx+9aUnYNjC2bGBSuJ5cMUh/BSD0cFOte/UmWORXc2b2Pe1vllJ/WiJjFEaccmFVfwOQlORh9o+xDypp721qzdl437An4X7mt9ZCbzuY6ZIfYo6KD9eLQ5PuTsyls5/ujE2WnO4au+OIvmNM3X
\ No newline at end of file
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index f5a9ad1..d9ff4e6 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -15,7 +15,6 @@ frog,frog.bitmask.i,frog.bitmask.net,199.119.112.23 ecdsa-sha2-nistp256 AAAAE2Vj
 gadwall,gadwall.cdev.bitmask.i,gadwall.cdev.bitmask.net,199.119.112.5 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC4ycn7GabjeeewBmzTUbH+rZjRQV9seFmqbW2o5cE4jLsbPIMcMRRwLhA7TfIRLL7bLyuRNUWXwOqKZb/Psiog=
 gorilla,gorilla.bleeding.bitmask.i,gorilla.bleeding.bitmask.net,1.209.122.26 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAvgagCu3wyJizByW+JMLGn0CcMIDSxBU0QdBqcu65DDKOyJvVWL2fSHEOu0xdVmQow7ecoirrJZqL6VzrFVp8ur1Rn7+IR2RdtADtel4dbi7Hr1PuvNTKuE/NsRtX3p+zZHEl6SkFBVIgInlfezQxyytyLzL5mCjUCIe74krHDrU9bLkIwet3V/33SHjNYvv4BZ0VxCjvioI6iallhTw0ysizNFrbt3gyOCmS64E9qZWzYhzYUz8lF6nGpjNuwFcqrnZ0UN9Pk9905YuVAjO9H9kAIEKQ+bqAY0va8jcVC7NRKv3n5E7JFbr4SzSoOLulmkVDPRimax2XEt1fA8vr
 hippo,hippo.bitmask.i,hippo.bitmask.net,85.17.92.143 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc=
-koala,koala.unstable.bitmask.i,koala.unstable.bitmask.net,199.119.112.124 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/vYiNb13aZ+qPxrJlCTioJ6km/qhmlXqXID+gINmACVLq+67lfhDhK6ecr4wHpPnItzYpL+VCd/3SW51cZn7tKog2i3o4ZosajyKxj6AgPDOXGot3CKJzTwTuVvqfZWFnFEz9EOPjEFhuN/P+11qkqWcYnv1nezkiPIMxlwDtIu1zdFBoTA9xVLhmtotkVmlne0Lx+9aUnYNjC2bGBSuJ5cMUh/BSD0cFOte/UmWORXc2b2Pe1vllJ/WiJjFEaccmFVfwOQlORh9o+xDypp721qzdl437An4X7mt9ZCbzuY6ZIfYo6KD9eLQ5PuTsyls5/ujE2WnO4au+OIvmNM3X
 ladybug,ladybug.dev.bitmask.i,ladybug.dev.bitmask.net,199.119.112.8 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDB2QMVLYRTwLfZzafas9wTfh1OsHCuRFc1yfezZt/hPPYbNREkbDLW7xgvCBFAqZdRU/1EEyzTdLwUPWP7RtFRSVPrBn3Re9Y2DmVno4YR/7SklWo330tc3aNX5sVFfvgSLHqe4T/SOSmQvjPz/AxkRekIi7Rsjrew9C3SiCZ9S3PygxEQw3XnPoeh4Kju1fl7eXSzLwWVu1TtUJvRn6gbP9+qTY5/1e9MHEBD0zOXO7tAcRWwjkzMPdQ1GgMqvAqamtIXOmG2RWXApeaitix8qZQlC/eb1pJzlh2b5MNiizJPS1rCqnGSN3Jx6H5CqthKWu1JaUzxGhLacuu5AWSN
 leech,leech.demo.bitmask.i,leech.demo.bitmask.net,198.252.153.85 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCiT3/fejkQIAny1f71ijFYaSEcYho6gR10z20ctmLumV3pHtXcFXtHqzAFJ07txANyef5P/yiIOl+/x/uRANjo=
 millipede,millipede.demo.bitmask.i,millipede.demo.bitmask.net,198.252.153.83 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo=
diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml
index 55f2563..992a102 100644
--- a/hiera/chameleon.yaml
+++ b/hiera/chameleon.yaml
@@ -154,16 +154,10 @@ haproxy:
   couch: 
     listen_port: 4096
     servers: 
-      koala: 
-        backup: false
-        host: localhost
-        port: 4000
-        weight: 100
-        writable: true
       panda: 
         backup: false
         host: localhost
-        port: 4001
+        port: 4000
         weight: 100
         writable: true
 hosts: 
@@ -245,12 +239,6 @@ hosts:
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc="
     ip_address: "85.17.92.143"
     port: 4422
-  koala: 
-    domain_full: koala.unstable.bitmask.net
-    domain_internal: koala.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/vYiNb13aZ+qPxrJlCTioJ6km/qhmlXqXID+gINmACVLq+67lfhDhK6ecr4wHpPnItzYpL+VCd/3SW51cZn7tKog2i3o4ZosajyKxj6AgPDOXGot3CKJzTwTuVvqfZWFnFEz9EOPjEFhuN/P+11qkqWcYnv1nezkiPIMxlwDtIu1zdFBoTA9xVLhmtotkVmlne0Lx+9aUnYNjC2bGBSuJ5cMUh/BSD0cFOte/UmWORXc2b2Pe1vllJ/WiJjFEaccmFVfwOQlORh9o+xDypp721qzdl437An4X7mt9ZCbzuY6ZIfYo6KD9eLQ5PuTsyls5/ujE2WnO4au+OIvmNM3X"
-    ip_address: "199.119.112.124"
-    port: 4422
   ladybug: 
     domain_full: ladybug.dev.bitmask.net
     domain_internal: ladybug.dev.bitmask.i
@@ -481,15 +469,6 @@ nagios:
       services: 
         - openvpn
       ssh_port: 4422
-    koala: 
-      domain_full_suffix: unstable.bitmask.net
-      domain_internal: koala.unstable.bitmask.i
-      domain_internal_suffix: unstable.bitmask.i
-      environment: unstable
-      ip_address: "199.119.112.124"
-      services: 
-        - couchdb
-      ssh_port: 4422
     ladybug: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: ladybug.dev.bitmask.i
@@ -689,13 +668,8 @@ ssh:
 stunnel: 
   clients: 
     couch_client: 
-      koala_5984: 
-        accept_port: 4000
-        connect: koala.unstable.bitmask.i
-        connect_port: 15984
-        original_port: 5984
       panda_5984: 
-        accept_port: 4001
+        accept_port: 4000
         connect: panda.unstable.bitmask.i
         connect_port: 15984
         original_port: 5984
diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml
index 995ee1f..8693103 100644
--- a/hiera/octopus.yaml
+++ b/hiera/octopus.yaml
@@ -21,25 +21,13 @@ haproxy:
   couch: 
     listen_port: 4096
     servers: 
-      koala: 
-        backup: false
-        host: localhost
-        port: 4000
-        weight: 100
-        writable: true
       panda: 
         backup: false
         host: localhost
-        port: 4001
+        port: 4000
         weight: 100
         writable: true
 hosts: 
-  koala: 
-    domain_full: koala.unstable.bitmask.net
-    domain_internal: koala.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/vYiNb13aZ+qPxrJlCTioJ6km/qhmlXqXID+gINmACVLq+67lfhDhK6ecr4wHpPnItzYpL+VCd/3SW51cZn7tKog2i3o4ZosajyKxj6AgPDOXGot3CKJzTwTuVvqfZWFnFEz9EOPjEFhuN/P+11qkqWcYnv1nezkiPIMxlwDtIu1zdFBoTA9xVLhmtotkVmlne0Lx+9aUnYNjC2bGBSuJ5cMUh/BSD0cFOte/UmWORXc2b2Pe1vllJ/WiJjFEaccmFVfwOQlORh9o+xDypp721qzdl437An4X7mt9ZCbzuY6ZIfYo6KD9eLQ5PuTsyls5/ujE2WnO4au+OIvmNM3X"
-    ip_address: "199.119.112.124"
-    port: 4422
   octopus: 
     domain_full: octopus.unstable.bitmask.net
     domain_internal: octopus.unstable.bitmask.i
@@ -81,7 +69,6 @@ mynetworks:
   - "198.252.153.85"
   - "199.119.112.10"
   - "199.119.112.12"
-  - "199.119.112.124"
   - "199.119.112.16"
   - "199.119.112.19"
   - "199.119.112.23"
@@ -169,13 +156,8 @@ ssh:
 stunnel: 
   clients: 
     couch_client: 
-      koala_5984: 
-        accept_port: 4000
-        connect: koala.unstable.bitmask.i
-        connect_port: 15984
-        original_port: 5984
       panda_5984: 
-        accept_port: 4001
+        accept_port: 4000
         connect: panda.unstable.bitmask.i
         connect_port: 15984
         original_port: 5984
diff --git a/hiera/panda.yaml b/hiera/panda.yaml
index 923e5d1..814af65 100644
--- a/hiera/panda.yaml
+++ b/hiera/panda.yaml
@@ -7,8 +7,7 @@ couch:
     cookie: 8Eptmk6hSCaLN6WjWaZGtQbq2IKXnTRe
     ednp_port: 9002
     epmd_port: 4369
-    neighbors: 
-      - koala.unstable.bitmask.net
+    neighbors: []
   master: false
   mode: multimaster
   port: 5984
@@ -56,12 +55,6 @@ domain:
 enabled: true
 environment: unstable
 hosts: 
-  koala: 
-    domain_full: koala.unstable.bitmask.net
-    domain_internal: koala.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/vYiNb13aZ+qPxrJlCTioJ6km/qhmlXqXID+gINmACVLq+67lfhDhK6ecr4wHpPnItzYpL+VCd/3SW51cZn7tKog2i3o4ZosajyKxj6AgPDOXGot3CKJzTwTuVvqfZWFnFEz9EOPjEFhuN/P+11qkqWcYnv1nezkiPIMxlwDtIu1zdFBoTA9xVLhmtotkVmlne0Lx+9aUnYNjC2bGBSuJ5cMUh/BSD0cFOte/UmWORXc2b2Pe1vllJ/WiJjFEaccmFVfwOQlORh9o+xDypp721qzdl437An4X7mt9ZCbzuY6ZIfYo6KD9eLQ5PuTsyls5/ujE2WnO4au+OIvmNM3X"
-    ip_address: "199.119.112.124"
-    port: 4422
   octopus: 
     domain_full: octopus.unstable.bitmask.net
     domain_internal: octopus.unstable.bitmask.i
@@ -164,18 +157,8 @@ ssh:
   port: 4422
 stunnel: 
   clients: 
-    ednp_clients: 
-      koala_9002: 
-        accept_port: 4001
-        connect: koala.unstable.bitmask.i
-        connect_port: 19002
-        original_port: 9002
-    epmd_clients: 
-      koala_4369: 
-        accept_port: 4000
-        connect: koala.unstable.bitmask.i
-        connect_port: 14369
-        original_port: 4369
+    ednp_clients: {}
+    epmd_clients: {}
   servers: 
     couch_server: 
       accept_port: 15984
diff --git a/nodes/koala.json b/nodes/koala.json
deleted file mode 100644
index 5a3db0b..0000000
--- a/nodes/koala.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "services": "couchdb",
-  "tags": ["unstable", "dc"],
-  "ip_address": "199.119.112.124",
-  "ssh": {
-    "port": 4422
-  }
-}