Remove small bootstrap playbook and merge it in site.yml

2 files changed, 17 insertions, 24 deletions

diff --git a/bootstrap.yml b/bootstrap.yml
deleted file mode 100644
index 65218328..00000000
--- a/bootstrap.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: "Machine bootstrap"
-  gather_facts: true
-  tags: ["required_for_boot"]
-  hosts:
-    - marchlinux.local
-    - archlinux.local
-    - ubuntu.local
-    - rpi5.local
-  roles:
-    - role: "hostname"
-    - role: "network"
-    - role: "user"
-    - role: "ssh"
-    - role: "password_policy"
-  pre_tasks:
-    - name: "Update package cache"
-      become: true
-      ansible.builtin.package:
-        update_cache: true
-      async: 60
-      poll: 5
-      failed_when: false
diff --git a/site.yml b/site.yml
index f2140ce6..34c96e5b 100644
--- a/site.yml
+++ b/site.yml
@@ -1,6 +1,22 @@
 ---
 - name: "Bootstrap"
-  ansible.builtin.import_playbook: "bootstrap.yml"
+  gather_facts: true
+  tags: ["required_for_boot"]
+  hosts: all
+  roles:
+    - role: "hostname"
+    - role: "network"
+    - role: "user"
+    - role: "ssh"
+    - role: "password_policy"
+  pre_tasks:
+    - name: "Update package cache"
+      become: true
+      ansible.builtin.package:
+        update_cache: true
+      async: 60
+      poll: 5
+      failed_when: false
 
 - name: "Configure"
   ansible.builtin.import_playbook: "configure.yml"