diff options
| author | Vlastimil Holer <vlastimil.holer@gmail.com> | 2012-09-24 13:28:51 +0200 |
|---|---|---|
| committer | Vlastimil Holer <vlastimil.holer@gmail.com> | 2012-09-24 13:28:51 +0200 |
| commit | 9eaafc7379e0c6ded70a851a703a5bc5c7e56e42 (patch) | |
| tree | 17c67c612d6b8ac864a09b03fdf9b97eeb75f78a /cloudinit/sources | |
| parent | ea42bf67999c1ef61fa46ab805b0093b95dc575f (diff) | |
| download | vyos-cloud-init-9eaafc7379e0c6ded70a851a703a5bc5c7e56e42.tar.gz vyos-cloud-init-9eaafc7379e0c6ded70a851a703a5bc5c7e56e42.zip | |
Process userdata, ignored by mistake.
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/DataSourceOpenNebula.py | 5 |
1 files 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 |