From ef05c82f500d0745b2fd36dd76589fbc01eaeb5f Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 15 Apr 2019 18:55:54 +0200 Subject: [PATCH] prepare bugfix release --- CHANGELOG.md | 3 ++- ansiblelater/__init__.py | 2 +- ansiblelater/rules/rolefiles.py | 2 +- ansiblelater/settings.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bbbb00..5440788 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,3 @@ - BUGFIXES - - Set minimum number of workers to 2 + - Fix missing exit code + - Fix small role issues diff --git a/ansiblelater/__init__.py b/ansiblelater/__init__.py index 18ff12e..da7a434 100644 --- a/ansiblelater/__init__.py +++ b/ansiblelater/__init__.py @@ -2,7 +2,7 @@ __author__ = "Robert Kaussow" __project__ = "ansible-later" -__version__ = "0.2.1" +__version__ = "0.2.2" __license__ = "MIT" __maintainer__ = "Robert Kaussow" __email__ = "mail@geeklabor.de" diff --git a/ansiblelater/rules/rolefiles.py b/ansiblelater/rules/rolefiles.py index d7d9383..1fe8545 100644 --- a/ansiblelater/rules/rolefiles.py +++ b/ansiblelater/rules/rolefiles.py @@ -1,12 +1,12 @@ """Checks related to ansible roles files.""" +from ansible.parsing.yaml.objects import AnsibleMapping from nested_lookup import nested_lookup from ansiblelater.command.candidates import Error from ansiblelater.command.candidates import Result from ansiblelater.utils.rulehelper import get_raw_yaml from ansiblelater.utils.rulehelper import get_tasks -from ansible.parsing.yaml.objects import AnsibleMapping def check_meta_main(candidate, settings): diff --git a/ansiblelater/settings.py b/ansiblelater/settings.py index 16f0aa1..46cf2c9 100644 --- a/ansiblelater/settings.py +++ b/ansiblelater/settings.py @@ -81,8 +81,8 @@ class Settings(object): s = stream.read() sdict = utils.safe_load(s) if self._validate(sdict): - sdict["logging"]["level"] = sdict["logging"]["level"].upper() anyconfig.merge(defaults, sdict, ac_merge=anyconfig.MS_DICTS) + defaults["logging"]["level"] = defaults["logging"]["level"].upper() if cli_options and self._validate(cli_options): anyconfig.merge(defaults, cli_options, ac_merge=anyconfig.MS_DICTS)