Add vars for replace filter
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Chris Hammer 2024-03-02 16:30:55 -05:00
parent db75e69d99
commit b2300e8ba8
3 changed files with 5 additions and 3 deletions

View File

@ -8,7 +8,7 @@ namespace: jchristianh
name: baseos name: baseos
# The version of the collection. Must be compatible with semantic versioning # The version of the collection. Must be compatible with semantic versioning
version: 1.0.28 version: 1.0.29
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md readme: README.md

View File

@ -7,5 +7,7 @@ motd_host_uptime : "{{ now().replace(microsecond=0) - now().fromtimestamp(now(
motd_day_filter : "(.* day[s]?),\\s+(\\d+):(\\d+):(\\d+)" motd_day_filter : "(.* day[s]?),\\s+(\\d+):(\\d+):(\\d+)"
motd_nonday_filter : "(\\d+):(\\d+):(\\d+)" motd_nonday_filter : "(\\d+):(\\d+):(\\d+)"
motd_day_filter_repl : "\\1 \\2 hours \\3 minutes"
motd_nonday_filter_repl : "\\1 hours \\2 minutes \\3 seconds"
... ...

View File

@ -1,14 +1,14 @@
--- ---
- name: Format uptime containing days - name: Format uptime containing days
ansible.builtin.set_fact: ansible.builtin.set_fact:
uptime_formatted: "{{ motd_host_uptime | regex_replace(motd_day_filter, '\\1 \\2 hours \\3 minutes') }}" uptime_formatted: "{{ motd_host_uptime | regex_replace(motd_day_filter, motd_day_filter_repl) }}"
when: when:
- "'day' in motd_host_uptime" - "'day' in motd_host_uptime"
- name: Format uptime not containing days - name: Format uptime not containing days
ansible.builtin.set_fact: ansible.builtin.set_fact:
uptime_formatted: "{{ motd_host_uptime | regex_replace(motd_nonday_filter, '\\1 hours \\2 minutes \\3 seconds') }}" uptime_formatted: "{{ motd_host_uptime | regex_replace(motd_nonday_filter, motd_nonday_filter_repl) }}"
when: when:
- "'day' not in motd_host_uptime" - "'day' not in motd_host_uptime"