From: Andrew Schoen Date: Thu, 18 Dec 2014 15:07:23 +0000 (-0600) Subject: Including a couple FIXME comments in misc.get_distro so we can remember X-Git-Tag: 1.1.0~1059^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F396%2Fhead;p=teuthology.git Including a couple FIXME comments in misc.get_distro so we can remember to revisit this function later. Signed-off-by: Andrew Schoen --- diff --git a/teuthology/misc.py b/teuthology/misc.py index d4fa4fb2..2961d5b5 100644 --- a/teuthology/misc.py +++ b/teuthology/misc.py @@ -1155,13 +1155,19 @@ def get_distro(ctx): """ os_type = None # first, try to get the os_type from the config or --os-type - # note that if --os-type is passed it's assigned to config["os_type"] - # in teuthology.run.py + # FIXME: checking for ctx.os_type here should not be needed as + # ctx.os_type is assigned to ctx.config["os_type"] if provided + # in teuthology.run. We're gonna leave it here for now until we + # have the time to fully investigate and test it's removal. try: os_type = ctx.config.get('os_type', ctx.os_type) except AttributeError: pass # next, look for an override in the downburst config for os_type + # FIXME: checking the downburst config for distro shouldn't be needed + # as it's only used in provision.create_if_vm and that function performs + # this check again while building the config for downburst. Leaving it + # here for now until we can fully investigate and test it's removal. try: os_type = ctx.config['downburst'].get('distro', os_type) except (KeyError, AttributeError):