From db6c8288ee7474d9453fdf402c2ea2ec2822541d Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Mon, 18 Mar 2013 14:47:05 +0000 Subject: [PATCH] [molecule.settings] drop execution_strategy default to "livecd" --- molecule/settings.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/molecule/settings.py b/molecule/settings.py index 66159dd..f15f15c 100644 --- a/molecule/settings.py +++ b/molecule/settings.py @@ -236,18 +236,10 @@ class SpecParser: self.filepath = filepath[:] self._preprocessor = SpecPreprocessor(self.filepath) - # FIXME: kept for backward .spec files compatibility where - # execution_strategy argument is not set - # TODO: remove and make execution_strategy mandatory in .spec file - from molecule.specs.plugins.builtin_plugin import LivecdSpec - - execution_strategy = self.parse_execution_strategy() - if execution_strategy is None: - execution_strategy = LivecdSpec.execution_strategy() - from molecule.specs.factory import PluginFactory spec_plugins = PluginFactory.get_spec_plugins() + execution_strategy = self.parse_execution_strategy() plugin = spec_plugins.get(execution_strategy) if plugin is None: raise SpecFileError("Execution strategy provided in %s spec file"