Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop a.collector from the active collectors #337

Merged
merged 2 commits into from Aug 12, 2019
Merged

Drop a.collector from the active collectors #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4c22ab
Drop a.collector from the active collectors
hellais Aug 9, 2019
bf7dbc8
Use active_collector group in have_collector.json
hellais Aug 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions ansible/inventory
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/airflow/templates/have_collector.json
View file
Open in desktop
@@ -1 +1 @@
{{ groups.have_collector | to_nice_json }}
{{ groups.active_collector | to_nice_json }}
2 changes: 1 addition & 1 deletion ansible/roles/airflow/templates/known_collectors
View file
Open in desktop
@@ -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 %}