diff options
Diffstat (limited to 'resources/ansible_roles/inxi')
| -rw-r--r-- | resources/ansible_roles/inxi/tasks/main.yml | 2 | ||||
| -rw-r--r-- | resources/ansible_roles/inxi/templates/system-info.j2 | 20 |
2 files changed, 8 insertions, 14 deletions
diff --git a/resources/ansible_roles/inxi/tasks/main.yml b/resources/ansible_roles/inxi/tasks/main.yml index f6216df4..1050c9be 100644 --- a/resources/ansible_roles/inxi/tasks/main.yml +++ b/resources/ansible_roles/inxi/tasks/main.yml @@ -42,7 +42,7 @@ patterns: - '.+\s+Host:\s+(?P<hostname>.+)\sKernel' - '.+\sMemory:\s+(?P<memory>.+MB)\s' - - '^CPU\(s\):\s+(?P<cpu>.+)' + - '^CPU\(s\):\s+(?P<cpu>.+)\sspeed\/max' - '.+\sDistro:\s+(?P<os>.+)' - '.+\sKernel:\s+(?P<kernel>.+)\sConsole' - '.+\s+HDD Total Size:\s+(?P<disk>.+)\s' diff --git a/resources/ansible_roles/inxi/templates/system-info.j2 b/resources/ansible_roles/inxi/templates/system-info.j2 index 305a2af2..2108a979 100644 --- a/resources/ansible_roles/inxi/templates/system-info.j2 +++ b/resources/ansible_roles/inxi/templates/system-info.j2 @@ -1,16 +1,10 @@ System Information from inxi ============================ -{% for host in groups['compute'] %} -{{ hostvars[host].ansible_hostname }} ------------------------------ - -{{ ('CPU Brand', hostvars[host].system_info.cpu[0])|justify }} -{{ ('Disk', hostvars[host].system_info.disk[0])|justify }} -{{ ('Host Name', hostvars[host].system_info.hostname[0])|justify }} -{{ ('Kernel', hostvars[host].system_info.kernel[0])|justify }} -{{ ('Memory', hostvars[host].system_info.memory[0])|justify }} -{{ ('Operating System', hostvars[host].system_info.os[0])|justify }} -{{ ('Product', hostvars[host].system_info.product[0])|justify }} - -{% endfor %} +{{ ('CPU Brand', system_info.cpu[0])|justify }} +{{ ('Disk', system_info.disk[0])|justify }} +{{ ('Host Name', system_info.hostname[0])|justify }} +{{ ('Kernel', system_info.kernel[0])|justify }} +{{ ('Memory', system_info.memory[0])|justify }} +{{ ('Operating System', system_info.os[0])|justify }} +{{ ('Product', system_info.product[0])|justify }} |