From cfa5a982ece0d75188029003d4fb43caed945ae2 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 9 Jun 2015 11:16:52 +0200 Subject: removed koala from unstable.bm so we only have one couch node --- hiera/chameleon.yaml | 30 ++---------------------------- hiera/octopus.yaml | 22 ++-------------------- hiera/panda.yaml | 23 +++-------------------- 3 files changed, 7 insertions(+), 68 deletions(-) (limited to 'hiera') 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 -- cgit v1.2.3