From 9eaafc7379e0c6ded70a851a703a5bc5c7e56e42 Mon Sep 17 00:00:00 2001
From: Vlastimil Holer <vlastimil.holer@gmail.com>
Date: Mon, 24 Sep 2012 13:28:51 +0200
Subject: Process userdata, ignored by mistake.

---
 cloudinit/sources/DataSourceOpenNebula.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py
index 0b498a54..ad65a36e 100644
--- a/cloudinit/sources/DataSourceOpenNebula.py
+++ b/cloudinit/sources/DataSourceOpenNebula.py
@@ -54,7 +54,6 @@ class DataSourceOpenNebula(sources.DataSource):
 
         found = None
         md = {}
-        ud = ""
 
         results = {}
         if os.path.isdir(self.seed_dir):
@@ -121,7 +120,7 @@ class DataSourceOpenNebula(sources.DataSource):
 
         self.seed = found
         self.metadata = md
-        self.userdata_raw = ud
+        self.userdata_raw = results.get('userdata')
 
         return True
 
@@ -237,7 +236,7 @@ def read_context_disk_dir(source_dir):
     # raw user data
     if "user_data" in context_sh:
         results['userdata'] = context_sh["user_data"]
-    if "userdata" in context_sh:
+    elif "userdata" in context_sh:
         results['userdata'] = context_sh["userdata"]
 
     return results
-- 
cgit v1.2.3