diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-02-07 14:36:33 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-02-07 14:36:33 -0500 |
| commit | 6e5094de9d87bc69970ff813956886c548211f40 (patch) | |
| tree | 306f775125bf8d602d91899a6b20602fcc1b922a | |
| parent | af2eb02be2bea26545ce0e2dafe7662b5cc7e337 (diff) | |
| download | vyos-cloud-init-6e5094de9d87bc69970ff813956886c548211f40.tar.gz vyos-cloud-init-6e5094de9d87bc69970ff813956886c548211f40.zip | |
rename 'datadir' key to 'data' in pathmap
| -rw-r--r-- | cloudinit/CloudConfig/cc_update_hostname.py | 2 | ||||
| -rw-r--r-- | cloudinit/__init__.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/CloudConfig/cc_update_hostname.py b/cloudinit/CloudConfig/cc_update_hostname.py index a49f8649..9ef02251 100644 --- a/cloudinit/CloudConfig/cc_update_hostname.py +++ b/cloudinit/CloudConfig/cc_update_hostname.py @@ -29,7 +29,7 @@ def handle(name,cfg,cloud,log,args): try: hostname = util.get_cfg_option_str(cfg,"hostname",cloud.get_hostname()) - prev ="%s/%s" % (cloud.get_cpath('datadir'),"previous-hostname") + prev ="%s/%s" % (cloud.get_cpath('data'),"previous-hostname") update_hostname(hostname, prev, log) except Exception as e: log.warn("failed to set hostname\n") diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py index fb153e4b..7fc919fa 100644 --- a/cloudinit/__init__.py +++ b/cloudinit/__init__.py @@ -42,7 +42,7 @@ pathmap = { "userdata" : "/user-data.txt.i", "obj_pkl" : "/obj.pkl", "cloud_config" : "/cloud-config.txt", - "datadir" : "/data", + "data" : "/data", None : "", } @@ -219,7 +219,7 @@ class CloudInit: util.ensure_dirs(dlist) ds = "%s: %s\n" % ( self.datasource.__class__, str(self.datasource) ) - dp = self.get_cpath('datadir') + dp = self.get_cpath('data') util.write_file("%s/%s" % (idir, 'datasource'), ds) util.write_file("%s/%s" % (dp, 'previous-datasource'), ds) util.write_file("%s/%s" % (dp, 'previous-instance-id'), "%s\n" % iid) |