From 6a6113e9510b9a34b3890b6e165dd9f2d3ccc667 Mon Sep 17 00:00:00 2001 From: tmshn Date: Tue, 3 Jan 2017 18:06:54 +0900 Subject: [PATCH] [timezone module] Return tzfile from _verify_timezone (fix #19745) Modification picked from https://github.com/ansible/ansible-modules-extras/pull/3337 --- lib/ansible/modules/system/timezone.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ansible/modules/system/timezone.py b/lib/ansible/modules/system/timezone.py index 008a34a850..3deb5be839 100644 --- a/lib/ansible/modules/system/timezone.py +++ b/lib/ansible/modules/system/timezone.py @@ -229,6 +229,7 @@ class Timezone(object): tzfile = '/usr/share/zoneinfo/%s' % tz if not os.path.isfile(tzfile): self.abort('given timezone "%s" is not available' % tz) + return tzfile class SystemdTimezone(Timezone): @@ -307,7 +308,7 @@ class NosystemdTimezone(Timezone): super(NosystemdTimezone, self).__init__(module) # Validate given timezone if 'name' in self.value: - self._verify_timezone() + tzfile = self._verify_timezone() self.update_timezone = self.module.get_bin_path('cp', required=True) self.update_timezone += ' %s /etc/localtime' % tzfile self.update_hwclock = self.module.get_bin_path('hwclock', required=True)