diff --git a/ara/config.py b/ara/config.py index 3679b16d..9de0f161 100644 --- a/ara/config.py +++ b/ara/config.py @@ -30,10 +30,10 @@ try: except ImportError: # Ansible 2.4 no longer provides load_config_file, this is handled further # down + from ansible.config.manager import find_ini_config_file # Also, don't scream deprecated things at us import ansible.constants ansible.constants._deprecated = lambda *args: None - pass from distutils.version import LooseVersion from six.moves import configparser @@ -95,7 +95,9 @@ DEFAULTS = { if LooseVersion(ansible_version) < LooseVersion('2.4.0'): config, path = load_config_file() else: + path = find_ini_config_file() config = configparser.ConfigParser() + config.read(path) # Some defaults need to be based on top of a "processed" ARA_DIR ARA_DIR = _ara_config(config, 'dir', 'ARA_DIR') diff --git a/requirements.txt b/requirements.txt index 5ba43037..b16ef668 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 jinja2>=2.9 -ansible>=2.2.0.0 +ansible>=2.2.0.0,!=2.4.0.0 Flask>=0.11,<0.13 Flask-SQLAlchemy Flask-Migrate diff --git a/run_tests.sh b/run_tests.sh index b05d94e3..54582c66 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -108,6 +108,7 @@ fi # Install ARA so it can be used from a virtual environment tox -e ${python_version} --notest source .tox/${python_version}/bin/activate +ansible_version=$(pip freeze |awk -F== '/ansible==/ {print $2}') ansible --version python --version