From a311d988b407129b69c7d38c2bcb9321779e949d Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Sat, 18 Nov 2017 22:09:31 -0600
Subject: [PATCH] tz.yml - discriptions and order

---
 roles/0-init/tasks/tz.yml | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/roles/0-init/tasks/tz.yml b/roles/0-init/tasks/tz.yml
index 91745f002..d2e0f4991 100644
--- a/roles/0-init/tasks/tz.yml
+++ b/roles/0-init/tasks/tz.yml
@@ -1,23 +1,32 @@
-- name: Check if the TZ is not already set - Can Fail
+- name: Check if the TZ is not already set via /etc/localtime - Can Fail
   shell: readlink /etc/localtime | awk -F "zoneinfo/" '{print $2}'
   register: TZ_set
   ignore_errors: True
 
-- name: Set to UTC if the TZ is not set already set
+- name: Set local and iiab TZ to UTC if /etc/localtime is not set
   set_fact:
       local_tz: 'UTC'
       iiab_TZ: 'UTC'
   when: TZ_set.stdout == ""
 
-- name: Set default Timezone -  Debian
-  shell: timedatectl set-timezone {{ iiab_TZ }}
-  when: is_debuntu and iiab_TZ is defined and iiab_TZ != "" and iiab_TZ != "TZ_set.stdout"
-
-- name: Set default Timezone -  Redhat
-  shell: ln -sf /usr/share/zoneinfo/{{ iiab_TZ }} /etc/localtime
-  when: is_redhat and iiab_TZ is defined and iiab_TZ != "" and iiab_TZ != "TZ_set.stdout"
-
-- name: override ansible on timezone
+- name: Override ansible on timezone if TZ set
   set_fact:
       local_tz: '{{ TZ_set.stdout }}'
   when: TZ_set.stdout != ""
+
+- name: Using iiab TZ for local TZ
+  set_fact:
+      local_tz: '{{ iiab_TZ }}'
+  when: iiab_TZ is defined and iiab_TZ != "" and iiab_TZ != "TZ_set.stdout"
+
+- name: Set default Timezone from iiab TZ -  Debian
+  shell: timedatectl set-timezone {{ iiab_TZ }}
+  when: is_debuntu and iiab_TZ is defined and iiab_TZ != "" and iiab_TZ != "TZ_set.stdout"
+
+- name: Set default Timezone from iiab TZ -  Redhat
+  file:
+      path: /etc/localtime
+      src: /usr/share/zoneinfo/{{ iiab_TZ }}
+      force: yes
+      state: link
+  when: is_redhat and iiab_TZ is defined and iiab_TZ != "" and iiab_TZ != "TZ_set.stdout"