diff options
| author | Scott Moser <smoser@ubuntu.com> | 2011-01-19 19:46:15 +0000 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2011-01-19 19:46:15 +0000 |
| commit | 7434e3306d2526173c92ab57db30a0812cc47717 (patch) | |
| tree | 54f3ad88ecdada0d3f694158b2da135388acf04e /cloudinit/DataSourceEc2.py | |
| parent | 01512fdad97b581cd8ac3da8758e704b060f3d03 (diff) | |
| download | vyos-cloud-init-7434e3306d2526173c92ab57db30a0812cc47717.tar.gz vyos-cloud-init-7434e3306d2526173c92ab57db30a0812cc47717.zip | |
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'
Diffstat (limited to 'cloudinit/DataSourceEc2.py')
| -rw-r--r-- | cloudinit/DataSourceEc2.py | 6 |
1 files changed, 3 insertions, 3 deletions
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: |