pull in the rework of /var/lib/cloud.

- /var/lib/cloud is redesigned, and its layout now described in
  doc/var-lib-cloud.txt.
  The big plus point of this was to get instance specific data
  into /var/lib/cloud/instances, so that data could easily be purged.

  A symlink /var/lib/cloud/instance -> /var/lib/cloud/instances/<current_id>
  is maintained.

- Also, now run scripts in /var/lib/cloud/scripts/
   per-once
   per-boot
   per-instance

- bugs addressed:
  - LP: #704509

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: