Finish ooni-data deployment ansible playbook

ansible/playbook-bootstrap.yml

@@ -1,8 +1,7 @@
 # This playbook is to be run on hosts that don't support bootstrapping the base
 # OS setup with something other than ansible (eg. cloud-init)
-- name: Ensure ssh_users are synched on all hosts
+- name: Bootstrap the ssh_users on target host
   hosts: all
-  #remote_user: root
-  become: yes
+  remote_user: root
   roles:
-    - bootstrap
+    - ssh_users

ansible/playbook.yml

@@ -1,4 +1,10 @@
 ---
+- name: Ensure all hosts are bootstrapped correctly
+  hosts: all
+  become: root
+  roles:
+    - bootstrap
+
 - name: ClickHouse servers
   hosts: clickhouse_servers
   user: admin
@@ -41,7 +47,6 @@
   become: true
   roles:
     - oonidata
-
 # commented out due to the fact it requires manual config of ~/.ssh/config
 #- name: Setup codesign box
 #  hosts: codesign-box

ansible/roles/bootstrap/tasks/main.yml

@@ -1,3 +1,8 @@
+- ansible.builtin.include_role:
+    name: ssh_users
+  tags:
+    - ssh_users
+
 - name: Set the hostname to inventory_hostname
   ansible.builtin.hostname:
     name: "{{ inventory_hostname }}"