diff options
| author | Scott Moser <smoser@brickies.net> | 2017-04-03 11:52:06 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-04-03 11:52:06 -0400 |
| commit | 3b2e493b51153cd5bc1fa91e6ac52f59d41fe3fb (patch) | |
| tree | 678b118605245e5bb1b218565728270702aba5b4 /cloudinit/sources/DataSourceOpenNebula.py | |
| parent | e018fa910fdf0dbf3aa22e59e935461babd205c4 (diff) | |
| parent | 61eb03fef92f435434d974fb46439189ef0b5f97 (diff) | |
| download | vyos-cloud-init-3b2e493b51153cd5bc1fa91e6ac52f59d41fe3fb.tar.gz vyos-cloud-init-3b2e493b51153cd5bc1fa91e6ac52f59d41fe3fb.zip | |
merge from master at 0.7.9-90-g61eb03fe
Diffstat (limited to 'cloudinit/sources/DataSourceOpenNebula.py')
| -rw-r--r-- | cloudinit/sources/DataSourceOpenNebula.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py index 1f1baf46..cd75e6ea 100644 --- a/cloudinit/sources/DataSourceOpenNebula.py +++ b/cloudinit/sources/DataSourceOpenNebula.py @@ -286,12 +286,12 @@ def parse_shell_config(content, keylist=None, bash=None, asuser=None, output = output[0:-1] # remove trailing null # go through output. First _start_ is for 'preset', second for 'target'. - # Add to target only things were changed and not in volitile + # Add to ret only things were changed and not in excluded. for line in output.split("\x00"): try: (key, val) = line.split("=", 1) if target is preset: - target[key] = val + preset[key] = val elif (key not in excluded and (key in keylist_in or preset.get(key) != val)): ret[key] = val |