summaryrefslogtreecommitdiff
path: root/bin
diff options
authorJeff Lane <jeffrey.lane@canonical.com>2016-09-09 19:36:21 -0400
committerJeff Lane <jeffrey.lane@canonical.com>2016-09-09 19:36:21 -0400
commit1f1be2ad05a708d397bbb57399af3a055cae6f40 (patch)
tree4044e66a77f9aeca03abe72306ca3df66d4c7694 /bin
parent3d904a03a93222a9ca1e665bb86a0dcce5c34f94 (diff)
Removed references to old default config file as it was never used. Options are passed either via Environment Vars (Checkbox) or arguments
Diffstat (limited to 'bin')
-rwxr-xr-xbin/virtualization27
1 files changed, 1 insertions, 26 deletions
diff --git a/bin/virtualization b/bin/virtualization
index 73ff24e..781e67c 100755
--- a/bin/virtualization
+++ b/bin/virtualization
@@ -447,35 +447,10 @@ final_message: CERTIFICATION BOOT COMPLETE
def test_kvm(args):
print("Executing KVM Test", file=sys.stderr)
- DEFAULT_CFG = "/etc/xdg/virtualization.cfg"
image = ""
timeout = ""
- # Configuration data can come from three sources.
- # Lowest priority is the config file.
- config_file = DEFAULT_CFG
- config = configparser.SafeConfigParser()
-
- try:
- config.readfp(open(config_file))
- except IOError:
- logging.warn("Config file %s was not found" % DEFAULT_CFG)
- logging.warn("Now looking for ENV variables and command line arguments instead")
- else:
- try:
- timeout = config.getfloat("KVM", "timeout")
- except ValueError:
- logging.warning('Invalid or Empty timeout in config file. '
- 'Falling back to default')
- except configparser.NoSectionError as e:
- logging.exception(e)
-
- try:
- image = config.get("KVM", "image")
- except configparser.NoSectionError:
- logging.exception('Invalid or Empty image in config file.')
-
- # Next in priority are environment variables.
+ # First in priority are environment variables.
if 'KVM_TIMEOUT' in os.environ:
try:
timeout = float(os.environ['KVM_TIMEOUT'])