Merge pull request #337 from ooni/drop-collector-a

Drop a.collector from the active collectors
ooni · Aug 12, 2019 · e0d62cf · e0d62cf
2 parents b770a51 + bf7dbc8
commit e0d62cf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/ansible/inventory b/ansible/inventory
@@ -161,6 +161,10 @@ hkgcollectora.ooni.nu
 miacollector.ooni.nu
 c.collector.ooni.io
 
+[active_collector]
+miacollector.ooni.nu
+c.collector.ooni.io
+
 [no_passwd] # hosts in inventory that should NOT have `passwd` applied because of various reasons
 irc-bouncer.service.ooni.io       # existing `passwd` that is hard to renumber
 deb.ooni.nu                       # no root for darkk

diff --git a/ansible/roles/airflow/templates/have_collector.json b/ansible/roles/airflow/templates/have_collector.json
@@ -1 +1 @@
-{{ groups.have_collector | to_nice_json }}
+{{ groups.active_collector | to_nice_json }}
diff --git a/ansible/roles/airflow/templates/known_collectors b/ansible/roles/airflow/templates/known_collectors
@@ -1,3 +1,3 @@
-{% for host in groups.have_collector %}
+{% for host in groups.active_collector %}
 {{ lookup('pipe', 'grep -F -e {}, {}/../ext/known_hosts'.format(host, inventory_dir)) }}
 {% endfor %}