From 92b99b325b2d437825cc87253e76c756a136ff28 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Mon, 27 Aug 2012 10:56:47 -0700
Subject: Update so that the content types searched for launch-index variable
 has a little more meaning and by default look in metadata for 'launch-index'
 and have ec2 instead look for a different variable (thus allowing more
 datasources to just work).

---
 cloudinit/sources/DataSourceEc2.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'cloudinit/sources/DataSourceEc2.py')

diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
index 3e450e7e..2a9a70f7 100644
--- a/cloudinit/sources/DataSourceEc2.py
+++ b/cloudinit/sources/DataSourceEc2.py
@@ -77,7 +77,10 @@ class DataSourceEc2(sources.DataSource):
                         self.metadata_address)
             return False
 
-    def get_launch_index(self):
+    @property
+    def launch_index(self):
+        if not self.metadata:
+            return None
         return self.metadata.get('ami-launch-index')
 
     def get_instance_id(self):
-- 
cgit v1.2.3