From 4f9c6424cc3cf989c55052e4cc94133a2978d999 Mon Sep 17 00:00:00 2001
From: Scott Walkinshaw <scott.walkinshaw@gmail.com>
Date: Fri, 10 Dec 2021 20:52:39 -0500
Subject: [PATCH] Add ansible-base to requirements

Bumps minimum required Ansible to >= 2.10 as well.

The Ansible ecosystem has changed how their versions and packages work
causing the main `ansible` package versions to no longer determine the
version of `ansible-playbook`. Instead, the new `ansible-base` package
is what matters.

Background: https://blog.while-true-do.io/ansible-release-3-0-0/

For example, installing `ansible==2.10.7` would result in
`ansible-playbook==2.10.16` which was confusing.

By adding `ansible-base` to our `requirements.txt`, we'll get more
consistent and predictable version constraints.

Installing `ansible-base==2.10.16` would result in
`ansible-playbook==2.10.16` as you'd expect.
---
 .circleci/config.yml                | 2 +-
 lib/trellis/plugins/vars/version.py | 4 ++--
 requirements.txt                    | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9e78a3993b..ac59b18eee 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -106,7 +106,7 @@ workflows:
           matrix:
             parameters:
               python-version: ["3.7.8", "2.7"]
-              ansible-version: ["~=2.9.0", "~=2.8.0"]
+              ansible-version: ["~=2.10.0"]
       - syntax-check-with-requirements-txt:
           name: syntax-check-python-<<matrix.python-version>>-requirements-txt
           matrix:
diff --git a/lib/trellis/plugins/vars/version.py b/lib/trellis/plugins/vars/version.py
index cee62944f7..5ecff33d4a 100644
--- a/lib/trellis/plugins/vars/version.py
+++ b/lib/trellis/plugins/vars/version.py
@@ -14,8 +14,8 @@
     from ansible.utils.display import Display
     display = Display()
 
-version_requirement = '2.8.0'
-version_tested_max = '2.10.7'
+version_requirement = '2.10.0'
+version_tested_max = '2.10.16'
 python3_required_version = '2.5.3'
 
 if version_info[0] == 3 and not ge(LooseVersion(__version__), LooseVersion(python3_required_version)):
diff --git a/requirements.txt b/requirements.txt
index cecd05381d..d794f8d619 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
-ansible>=2.8.0,<3.0
+ansible>=2.10.0,<3.0
+ansible-base>=2.10,<=2.10.16
 passlib