diff --git a/roles/0-init/tasks/main.yml b/roles/0-init/tasks/main.yml index dd80cc686..8debb36a2 100644 --- a/roles/0-init/tasks/main.yml +++ b/roles/0-init/tasks/main.yml @@ -74,8 +74,7 @@ # Put all computed vars here so derive properly from any prior var file - name: If the TZ is not set in env, set it to UTC - set_fact: local_tz='UTC' - when: local_tz == "" + include_tasks: tz.yml - name: Set port 80 for Admin Console set_fact: diff --git a/roles/2-common/tasks/tz.yml b/roles/0-init/tasks/tz.yml similarity index 86% rename from roles/2-common/tasks/tz.yml rename to roles/0-init/tasks/tz.yml index 7857783e9..91745f002 100644 --- a/roles/2-common/tasks/tz.yml +++ b/roles/0-init/tasks/tz.yml @@ -4,7 +4,9 @@ ignore_errors: True - name: Set to UTC if the TZ is not set already set - set_fact: local_tz='UTC' iiab_TZ='UTC' + set_fact: + local_tz: 'UTC' + iiab_TZ: 'UTC' when: TZ_set.stdout == "" - name: Set default Timezone - Debian @@ -16,5 +18,6 @@ when: is_redhat and iiab_TZ is defined and iiab_TZ != "" and iiab_TZ != "TZ_set.stdout" - name: override ansible on timezone - set_fact: local_tz=TZ_set.stdout + set_fact: + local_tz: '{{ TZ_set.stdout }}' when: TZ_set.stdout != ""