ansible/group_vars/all.yaml

@@ -1,6 +1,4 @@
 ---
 
-# connection
-
 ansible_connection: ssh
 ansible_become_method: sudo

ansible/host_vars/lab.yaml

@@ -1,10 +1,8 @@
 ---
 
-# connection
+# common
 
-ansible_user: ladmin
 ansible_become_user: ladmin
-ansible_os_family: Arch
 
 # sshd
 

ansible/host_vars/server.yaml

@@ -1,7 +0,0 @@
----
-
-# connection
-
-ansible_user: michael
-ansible_become_user: michael
-ansible_os_family: Arch

ansible/inventory/hosts.yaml

@@ -1,28 +1,27 @@
 all:
   children:
-    hypervisors:
-      hosts:
-        server:
-          ansible_host: server.balsillie.net
-        lab:
-          ansible_host: lab.balsillie.net
+    hosts:
+      server:
+        ansible_host: server.balsillie.net
+        ansible_os_family: Arch
+      lab:
+        ansible_host: lab.balsillie.net
+        ansible_os_family: Arch
+        ansible_user: ladmin
     nodes:
-      hosts:
-        node1:
-          ansible_host: node1.balsillie.net
-        node2:
-          ansible_host: node2.balsillie.net
-        node3:
-          ansible_host: node3.balsillie.net
+      node1:
+        ansible_host: node1.balsillie.net
+      node2:
+        ansible_host: node2.balsillie.net
+      node3:
+        ansible_host: node3.balsillie.net
     guests:
-      hosts:
-        router:
-          ansible_host: router.balsillie.net
+      router:
+        ansible_host: router.balsillie.net
     workstations:
-      hosts:
-        lat5420:
-          ansible_host: lat5420.balsillie.net
-        sff:
-          ansible_host: sff.balsillie.net
-        bridie:
-          ansible_host: bridie.balsillie.net
+      lat5420:
+        ansible_host: lat5420.balsillie.net
+      sff:
+        ansible_host: sff.balsillie.net
+      bridie:
+        ansible_host: bridie.balsillie.net

ansible/roles/sshd/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: install openssh arch
-  community.general.pacman:
+  ansible.general.pacman:
     name: "{{ openssh_packages }}"
     state: latest
     update_cache: true