diff options
author | Scott Moser <smoser@ubuntu.com> | 2014-01-17 15:12:57 -0500 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2014-01-17 15:12:57 -0500 |
commit | 121f7e28e7388f167ae4607b73a2c5ac58f9ec83 (patch) | |
tree | 6e2d0c733a4d3d4166bc12eaa2c6c4d252a2ca79 /cloudinit/sources/DataSourceOpenNebula.py | |
parent | 63a3fb1912f721ff161d75d956f6172a31971956 (diff) | |
parent | 98fd17c55b637f4e1d136c954567c1d9b23e6c20 (diff) | |
download | vyos-cloud-init-121f7e28e7388f167ae4607b73a2c5ac58f9ec83.tar.gz vyos-cloud-init-121f7e28e7388f167ae4607b73a2c5ac58f9ec83.zip |
merge from trunk
Diffstat (limited to 'cloudinit/sources/DataSourceOpenNebula.py')
-rw-r--r-- | cloudinit/sources/DataSourceOpenNebula.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py index 07dc25ff..b0464cbb 100644 --- a/cloudinit/sources/DataSourceOpenNebula.py +++ b/cloudinit/sources/DataSourceOpenNebula.py @@ -323,7 +323,7 @@ def parse_shell_config(content, keylist=None, bash=None, asuser=None, (output, _error) = util.subp(cmd, data=bcmd) # exclude vars in bash that change on their own or that we used - excluded = ("RANDOM", "LINENO", "_", "__v") + excluded = ("RANDOM", "LINENO", "SECONDS", "_", "__v") preset = {} ret = {} target = None |