diff options
author | Scott Moser <smoser@ubuntu.com> | 2014-01-23 15:17:17 -0500 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2014-01-23 15:17:17 -0500 |
commit | 573ee6d9d641356374ac616f53cb254d4da7c9db (patch) | |
tree | e96228256276875c47c5031160bd2f3cbe3b5398 /cloudinit/sources/DataSourceOpenNebula.py | |
parent | 1781668dd65737a800c2c8fdbb79c6f1288d3ef2 (diff) | |
parent | c833a84f08019ba4413937f2f1b1f12a4ffe5632 (diff) | |
download | vyos-cloud-init-573ee6d9d641356374ac616f53cb254d4da7c9db.tar.gz vyos-cloud-init-573ee6d9d641356374ac616f53cb254d4da7c9db.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 |