From be80a0add73c8942405b5bc8ef68ca8d6de9fba5 Mon Sep 17 00:00:00 2001 From: Jirayut Nimsaeng Date: Tue, 9 May 2017 15:40:39 +0700 Subject: Use timezone module for Ansible 2.2+ --- tasks/main.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'tasks/main.yml') diff --git a/tasks/main.yml b/tasks/main.yml index afe3731..491c04d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,20 +2,28 @@ - name: Include OS-specific variables. include_vars: "{{ ansible_os_family }}.yml" -- name: Set the correct timezone. +- name: Configure timezone (For Ansible 2.2+) + timezone: + name: "{{ ntp_timezone }}" + when: ansible_version.full >= "02.02.00.00" + +- name: Set the correct timezone. (For Ansible prior 2.2) file: src: "/usr/share/zoneinfo/{{ ntp_timezone }}" dest: /etc/localtime state: link force: yes + when: ansible_version.full < "02.02.00.00" # Debian family OSes also have an /etc/timezone file. -- name: Set timezone in /etc/timezone file. +- name: Set timezone in /etc/timezone file. (For Ansible prior 2.2) template: src: timezone.j2 dest: /etc/timezone force: yes - when: ansible_os_family == 'Debian' + when: + - ansible_os_family == 'Debian' + - ansible_version.full < "02.02.00.00" - name: Install NTP. package: -- cgit v1.2.1 From 1c16875b55c0c20f71e9c78b67cd38ce34022bd6 Mon Sep 17 00:00:00 2001 From: Jirayut Nimsaeng Date: Tue, 9 May 2017 20:26:42 +0700 Subject: Use timezone module and bump required minimum Ansible version to 2.2 --- tasks/main.yml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'tasks/main.yml') diff --git a/tasks/main.yml b/tasks/main.yml index 491c04d..8a14050 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,28 +2,9 @@ - name: Include OS-specific variables. include_vars: "{{ ansible_os_family }}.yml" -- name: Configure timezone (For Ansible 2.2+) +- name: Set timezone timezone: name: "{{ ntp_timezone }}" - when: ansible_version.full >= "02.02.00.00" - -- name: Set the correct timezone. (For Ansible prior 2.2) - file: - src: "/usr/share/zoneinfo/{{ ntp_timezone }}" - dest: /etc/localtime - state: link - force: yes - when: ansible_version.full < "02.02.00.00" - -# Debian family OSes also have an /etc/timezone file. -- name: Set timezone in /etc/timezone file. (For Ansible prior 2.2) - template: - src: timezone.j2 - dest: /etc/timezone - force: yes - when: - - ansible_os_family == 'Debian' - - ansible_version.full < "02.02.00.00" - name: Install NTP. package: -- cgit v1.2.1 From 86b8f5a1028386665c2c43bff2962b8ea476be78 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Sun, 11 Jun 2017 14:45:59 -0500 Subject: Fixes #33: Install tzdata alongside ntp so timezone data is present. --- tasks/main.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'tasks/main.yml') diff --git a/tasks/main.yml b/tasks/main.yml index 8a14050..a022447 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,15 +2,18 @@ - name: Include OS-specific variables. include_vars: "{{ ansible_os_family }}.yml" +- name: Ensure NTP-related packages are installed. + package: + name: "{{ item }}" + state: present + with_items: + - ntp + - tzdata + - name: Set timezone timezone: name: "{{ ntp_timezone }}" -- name: Install NTP. - package: - name: ntp - state: present - - name: Ensure NTP is running and enabled as configured. service: name: "{{ ntp_daemon }}" -- cgit v1.2.1