diff options
| author | Chad Smith <chad.smith@canonical.com> | 2019-01-28 20:07:03 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-01-28 20:07:03 +0000 |
| commit | 8ee294d567c071fff1f9567e968ba73602308192 (patch) | |
| tree | 42a1cda4be8b0870f564d14827f0f5a723255fe6 | |
| parent | 09dcecf37628c5809ae21d7785693cb7358ca94c (diff) | |
| download | vyos-cloud-init-8ee294d567c071fff1f9567e968ba73602308192.tar.gz vyos-cloud-init-8ee294d567c071fff1f9567e968ba73602308192.zip | |
opennebula: also exclude epochseconds from changed environment vars
In addition to EPOCHREALTIME there is also an EPOCHSECONDS environment
variable that OpenNebula needs to exclude as it is expected to change.
This commit supplements the other exclusion in commit
d1a2fe7307e9cf2251d1f9a666c12d71d3f522d6.
Without this fix, unittests will intermittently fail if
parse_shell_config is run across a timing boundary where the
EPOCHSECONDS changes mid-test.
LP: #1813641
| -rw-r--r-- | cloudinit/sources/DataSourceOpenNebula.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py index 6e1d04bd..02c9a7b8 100644 --- a/cloudinit/sources/DataSourceOpenNebula.py +++ b/cloudinit/sources/DataSourceOpenNebula.py @@ -337,7 +337,9 @@ 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 = ("EPOCHREALTIME", "RANDOM", "LINENO", "SECONDS", "_", "__v") + excluded = ( + "EPOCHREALTIME", "EPOCHSECONDS", "RANDOM", "LINENO", "SECONDS", "_", + "__v") preset = {} ret = {} target = None |