diff options
| author | Chad Smith <chad.smith@canonical.com> | 2019-01-26 15:06:42 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-01-26 15:06:42 +0000 |
| commit | d1a2fe7307e9cf2251d1f9a666c12d71d3f522d6 (patch) | |
| tree | 24996c9d1ce8b6b180527807fef3a5813571aa90 | |
| parent | c7248059dd2faaaadfbcef5c83e8e8ea166d6767 (diff) | |
| download | vyos-cloud-init-d1a2fe7307e9cf2251d1f9a666c12d71d3f522d6.tar.gz vyos-cloud-init-d1a2fe7307e9cf2251d1f9a666c12d71d3f522d6.zip | |
opennebula: exclude EPOCHREALTIME as known bash env variable with a delta
This branch is needed to allow cloud-init to sbuild on Ubuntu Disco.
OpenNebula:parse_shell_config tries to do a comparison of bash
environment values, excluding expected environment variables which
are known to change.
Bash on Ubuntu Disco surfaces a new EPOCHREALTIME environment variable
which wasn't in previous bash environments, this var needs to be
ignored by parse_shell_config too.
LP: #1813383
| -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 e62e9729..6e1d04bd 100644 --- a/cloudinit/sources/DataSourceOpenNebula.py +++ b/cloudinit/sources/DataSourceOpenNebula.py @@ -337,7 +337,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", "SECONDS", "_", "__v") + excluded = ("EPOCHREALTIME", "RANDOM", "LINENO", "SECONDS", "_", "__v") preset = {} ret = {} target = None |