Cleanup

ansible/deploy-api.yml

@@ -12,22 +12,3 @@
  - role: ooni-measurements
  tags: "api"
  ssl_domain: ams-api.ooni.nu
-
-# Commented out because it fails to run due to an old base OS
-#- hosts: hkgmetadb.infra.ooni.io
-# roles:
-# - role: pguser-readonly
-# login_user: shovel # FIXME: revoke superuser access from this user :)
-# login_password: '{{ shovel_postgres_password }}'
-# pg_db: metadb
-# pg_name: oomsm-beta
-# pg_password: '{{ oomsm_beta_postgres_password }}'
-# tags: pg
-#
-# - role: pguser-readonly
-# login_user: shovel # FIXME: revoke superuser access from this user :)
-# login_password: '{{ shovel_postgres_password }}'
-# pg_db: metadb
-# pg_name: amsapi
-# pg_password: '{{ metadb_amsapi_password }}'
-# tags: pg

ansible/deploy-backend.yml

@@ -22,7 +22,6 @@
  - "ps2.ooni.io"
  - "ps3.ooni.io"
  - "ps4.ooni.io"
- - role: postgresql11
  - role: ooni-backend
  ssl_domain: ams-pg.ooni.org
 

ansible/deploy-pipeline.yml

@@ -1,48 +1,2 @@
 ---
 - import_playbook: ansible-version.yml
-
-- hosts: [datacollector.infra.ooni.io, hkgmetadb.infra.ooni.io, amsmetadb.ooni.nu]
- roles:
- - docker_py
-
-- hosts: hkgmetadb.infra.ooni.io
- gather_facts: false # already gathered
- roles:
- - role: ooca-cert
- ooca_ssl_dir: /srv/pl-psql_ssl/pusher
- ooca_ssl_subj: '/O=OONI/OU=Prometheus Pusher/CN=plpsql@{{ inventory_hostname }}'
- ooca_group: plpsql
- ooca_ca: pusher_ca
- tags: [ on-rename, plpsql ]
-
-- hosts: [hkgmetadb.infra.ooni.io, amsmetadb.ooni.nu]
- gather_facts: false # already gathered
- vars:
- ansible_python_interpreter: "/root/venv/bin/python2.7"
- roles:
- - role: plpsql
- tags: plpsql
-
-- hosts: hkgmetadb.infra.ooni.io
- gather_facts: false
- tasks:
- - name: ensure replication user exists
- postgresql_user:
- login_host: localhost
- login_user: shovel
- login_password: '{{ shovel_postgres_password }}'
- db: metadb # otherwise connection fail
- name: amsrepl
- password: '{{ amsrepl_hkgmetadb_password }}'
- encrypted: true
- role_attr_flags: 'REPLICATION,LOGIN'
- state: present
- tags: plpsql
-
-- hosts: datacollector.infra.ooni.io
- gather_facts: false # already gathered
- vars:
- ansible_python_interpreter: "/root/venv/bin/python2.7"
- roles:
- - role: airflow
- tags: airflow

ansible/group_vars/all/vars.yml

@@ -22,16 +22,6 @@ passwd:
  # - uid [2000, 10000), grouped together by "service"
  # - base for next service is `echo $(( 2000 + 50*($RANDOM % 160) ))`
  # - login name must be <= 8 chars to be nice to `top` util
- afredis: {login: afredis, comment: Airflow Redis}
- afpsql: {login: afpsql, comment: Airflow Postgresql}
- afsched: {login: afsched, comment: Airflow Scheduler}
- afwebsrv: {login: afwebsrv, comment: Airflow Webserver}
- afworker: {login: afworker, comment: Airflow Worker}
- afflower: {login: afflower, comment: Airflow Celery Flower}
-
- plpsql: {login: plpsql, comment: Pipeline Postgresql} # DONE
- plshovel: {login: plshovel, comment: Pipeline Shovel}
-
  nodeexp: {login: nodeexp, comment: Prometheus Node Exporter} # DONE
  prometh: {login: prometh, comment: Prometheus Poller}
  alertman: {login: alertman, comment: Prometheus Alert Manager}
@@ -42,8 +32,6 @@ passwd:
 
  piwik: {login: piwik, comment: Piwik user}
 
- grav: {login: grav, comment: Grav user}
-
  prtreg: {login: prtreg, comment: Orchestration Registry}
  prtevent: {login: prtevent, comment: Orchestration Events}
  prtnotif: {login: prtnotif, comment: Orchestration Notifications}

ansible/host_vars/events.proteus.test.ooni.io/vars.yml

@@ -1,3 +1,3 @@
 ---
-adm_logins: [ art, federico, sarath, sbs, nuke ]
+adm_logins: [ art, federico, sbs ]
 ...

ansible/host_vars/monitoring.ooni.org/vars.yml

@@ -1,5 +1,5 @@
 ---
-adm_logins: [ art, federico, sarath, sbs ]
+adm_logins: [ art, federico, sbs ]
 ngxprom_scrapers:
  - prometheus.infra.ooni.io
 

ansible/host_vars/notify.proteus.test.ooni.io/vars.yml

@@ -1,3 +1,3 @@
 ---
-adm_logins: [ art, federico, sarath, sbs, nuke ]
+adm_logins: [ art, federico, sbs ]
 ...