From 7434e3306d2526173c92ab57db30a0812cc47717 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 19 Jan 2011 19:46:15 +0000 Subject: convert 'cachedir' to 'seeddir', move cloud_config, scripts to instance - cloud_config and scripts now live in instance directory - cachedir is now more correctly named 'seeddir' --- cloudinit/DataSourceEc2.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cloudinit/DataSourceEc2.py') diff --git a/cloudinit/DataSourceEc2.py b/cloudinit/DataSourceEc2.py index 84826276..fc8fac5a 100644 --- a/cloudinit/DataSourceEc2.py +++ b/cloudinit/DataSourceEc2.py @@ -30,7 +30,7 @@ import errno class DataSourceEc2(DataSource.DataSource): api_ver = '2009-04-04' - cachedir = cloudinit.cachedir + '/ec2' + seeddir = cloudinit.seeddir + '/ec2' def __init__(self): pass @@ -40,10 +40,10 @@ class DataSourceEc2(DataSource.DataSource): def get_data(self): seedret={ } - if util.read_optional_seed(seedret,base=self.cachedir + "/"): + if util.read_optional_seed(seedret,base=self.seeddir+ "/"): self.userdata_raw = seedret['user-data'] self.metadata = seedret['meta-data'] - cloudinit.log.debug("using seeded ec2 data in %s" % self.cachedir) + cloudinit.log.debug("using seeded ec2 data in %s" % self.seeddir) return True try: -- cgit v1.2.3