summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/CloudConfig/cc_timezone.py57
-rw-r--r--doc/examples/cloud-config.txt4
3 files changed, 62 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 18934465..35c5d81a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,3 +35,4 @@
system config. changen "cloud_type: auto" as configuration for this
to 'datasource_list: [ "Ec2" ]'. Each of the items in that list
must be modules that can be loaded by "DataSource<item>"
+ - add 'timezone' option to cloud-config (LP: #645458)
diff --git a/cloudinit/CloudConfig/cc_timezone.py b/cloudinit/CloudConfig/cc_timezone.py
new file mode 100644
index 00000000..f221819e
--- /dev/null
+++ b/cloudinit/CloudConfig/cc_timezone.py
@@ -0,0 +1,57 @@
+# vi: ts=4 expandtab
+#
+# Copyright (C) 2009-2010 Canonical Ltd.
+#
+# Author: Scott Moser <scott.moser@canonical.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from cloudinit.CloudConfig import per_instance
+from cloudinit import util
+import subprocess
+import os.path
+import shutil
+
+frequency = per_instance
+tz_base = "/usr/share/zoneinfo"
+
+def handle(name,cfg,cloud,log,args):
+ print args
+ if len(args) != 0:
+ timezone = args[0]
+ else:
+ timezone = util.get_cfg_option_str(cfg,"timezone",False)
+
+ if not timezone: return
+
+ tz_file = "%s/%s" % (tz_base , timezone)
+
+ if not os.path.isfile(tz_file):
+ log.debug("Invalid timezone %s" % tz_file)
+ raise Exception("Invalid timezone %s" % tz_file)
+
+ try:
+ fp=open("/etc/timezone","wb")
+ fp.write("%s\n" % timezone)
+ fp.close()
+ except:
+ log.debug("failed to write to /etc/timezone")
+ raise
+
+ try:
+ shutil.copy(tz_file, "/etc/localtime")
+ except:
+ log.debug("failed to copy %s to /etc/localtime" % tz_file)
+ raise
+
+ log.debug("set timezone to %s" % timezone)
+ return
diff --git a/doc/examples/cloud-config.txt b/doc/examples/cloud-config.txt
index 1ba51243..e2bf128e 100644
--- a/doc/examples/cloud-config.txt
+++ b/doc/examples/cloud-config.txt
@@ -324,3 +324,7 @@ output:
phone_home:
url: http://my.example.com/$INSTANCE_ID/
post: [ pub_key_dsa, pub_key_rsa, instance_id ]
+
+# timezone: set the timezone for this instance
+# the value of 'timezone' must exist in /usr/share/zoneinfo
+timezone: US/Eastern