Skip to content

Commit 447c8d8

Browse files
authored
Update rrule in tower_jobs_scheduled template to use better defaults and include timezone info. (#53)
* Update rrule to use defaults and include timezone * Add timezone with default to inventory template * Use jinja timezone var * Revert change to timezone var
1 parent 9c1e90d commit 447c8d8

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

inventory-generation/tower_jobs_schedules/templates/tower-management-host.yaml.j2

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ start_date: "{{ (start_date | regex_replace('^(.*)T.*$', '\\1') | to_datetime('%
44
end_date: "{{ (end_date | regex_replace('^(.*)T.*$', '\\1') | to_datetime('%Y-%m-%d')).strftime('%d %b %Y') }}"
55
archive_date: "{{ (archive_date | regex_replace('^(.*)T.*$', '\\1') | to_datetime('%Y-%m-%d')).strftime('%d %b %Y') }}"
66

7+
timezone: "{{ timezone | default("UTC") }}"
8+
79
delete_missing_items: false
810

911
ansible_tower:
@@ -21,7 +23,7 @@ ansible_tower:
2123
scm_update_on_launch: true
2224
job_templates:
2325
- name: "{{ customer_engagement }}-email-notify-list-of-users"
24-
description: "Job Template to send email notificaitons to users"
26+
description: "Job Template to send email notifications to users"
2527
inventory: "{{ customer_engagement }}-tower-mail-host"
2628
project: "infra-ansible"
2729
playbook: "playbooks/notifications/email-notify-list-of-users.yml"
@@ -54,7 +56,7 @@ ansible_tower:
5456
- name: "{{ customer_engagement }}-welcome-internal"
5557
description: "Welcome Internal for internal {{ company_name }} engagement members"
5658
{% raw -%}
57-
rrule: "{{ start_date | parse_datetime | to_rrule(freq=3, interval=1, count=1) }}"
59+
rrule: "{{ start_date | parse_datetime | replace_datetime(hour=5) | to_rrule(timezone=timezone) }}"
5860
{%- endraw %}
5961
unified_job_template: "{{ customer_engagement }}-email-notify-list-of-users"
6062
enabled: {{ enable_notifications | default(false) }}
@@ -65,7 +67,7 @@ ansible_tower:
6567
- name: "{{ customer_engagement }}-welcome-all"
6668
description: "Welcome notification for {{ company_name }} and {{ customer_name }}"
6769
{% raw -%}
68-
rrule: "{{ start_date | parse_datetime | to_rrule(freq=3, interval=1, count=1) }}"
70+
rrule: "{{ start_date | parse_datetime | replace_datetime(hour=5) | to_rrule(timezone=timezone) }}"
6971
{%- endraw %}
7072
unified_job_template: "{{ customer_engagement }}-email-notify-list-of-users"
7173
enabled: {{ enable_notifications | default(false) }}
@@ -76,7 +78,7 @@ ansible_tower:
7678
- name: "{{ customer_engagement }}-pre-offboard"
7779
description: "Pre-offboard"
7880
{% raw -%}
79-
rrule: "{{ end_date | parse_datetime | subtract_time(weeks=1) | to_rrule(freq=3, interval=1, count=1) }}"
81+
rrule: "{{ end_date | parse_datetime | replace_datetime(hour=5) | subtract_time(weeks=1) | to_rrule(timezone=timezone) }}"
8082
{%- endraw %}
8183
unified_job_template: "{{ customer_engagement }}-email-notify-list-of-users"
8284
enabled: {{ enable_notifications | default(false) }}
@@ -87,7 +89,7 @@ ansible_tower:
8789
- name: "{{ customer_engagement }}-offboard-1"
8890
description: "Offboard 1"
8991
{% raw -%}
90-
rrule: "{{ end_date | parse_datetime | add_time(days=3) | to_rrule(freq=3, interval=1, count=1) }}"
92+
rrule: "{{ end_date | parse_datetime | replace_datetime(hour=5) | add_time(days=3) | to_rrule(timezone=timezone) }}"
9193
{%- endraw %}
9294
unified_job_template: "{{ customer_engagement }}-email-notify-list-of-users"
9395
enabled: {{ enable_notifications | default(false) }}
@@ -98,7 +100,7 @@ ansible_tower:
98100
- name: "{{ customer_engagement }}-offboard-2"
99101
description: "Offboard 2"
100102
{% raw -%}
101-
rrule: "{{ archive_date | parse_datetime | subtract_time(weeks=3) | to_rrule(freq=3, interval=1, count=1) }}"
103+
rrule: "{{ archive_date | parse_datetime | replace_datetime(hour=5) | subtract_time(weeks=3) | to_rrule(timezone=timezone) }}"
102104
{%- endraw %}
103105
unified_job_template: "{{ customer_engagement }}-email-notify-list-of-users"
104106
enabled: {{ enable_notifications | default(false) }}
@@ -109,7 +111,7 @@ ansible_tower:
109111
- name: "{{ customer_engagement }}-offboard-3"
110112
description: "Offboard 3"
111113
{% raw -%}
112-
rrule: "{{ archive_date | parse_datetime | subtract_time(weeks=2) | to_rrule(freq=3, interval=1, count=1) }}"
114+
rrule: "{{ archive_date | parse_datetime | replace_datetime(hour=5) | subtract_time(weeks=2) | to_rrule(timezone=timezone) }}"
113115
{%- endraw %}
114116
unified_job_template: "{{ customer_engagement }}-email-notify-list-of-users"
115117
enabled: {{ enable_notifications | default(false) }}
@@ -120,7 +122,7 @@ ansible_tower:
120122
- name: "{{ customer_engagement }}-shutoff"
121123
description: "Shutoff e-mail for the {{ customer_engagement }} engagement"
122124
{% raw -%}
123-
rrule: "{{ archive_date | parse_datetime | to_rrule(freq=3, interval=1, count=1) }}"
125+
rrule: "{{ archive_date | parse_datetime | replace_datetime(hour=5) | to_rrule(timezone=timezone) }}"
124126
{%- endraw %}
125127
unified_job_template: "{{ customer_engagement }}-email-notify-list-of-users"
126128
enabled: {{ enable_notifications | default(false) }}

0 commit comments

Comments
 (0)