From a24f36cf657799d793a5e364753c38f5ebd902c4 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 --- meta/main.yml | 2 +- tasks/main.yml | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 4cfa5a2..9e6dd69 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,7 +6,7 @@ galaxy_info: description: NTP installation and configuration for Linux. company: "Midwestern Mac, LLC" license: "license (BSD, MIT)" - min_ansible_version: 1.8 + min_ansible_version: 2.2 platforms: - name: EL versions: 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.3