From: Zack Cerza <zack@cerza.org>
Date: Thu, 28 Apr 2022 22:35:21 +0000 (-0600)
Subject: Update ansible to 4.2.10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=02300839aa6ad9b13e8ee0869b3e51a459180913;p=teuthology.git

Update ansible to 4.2.10

To fix https://github.com/advisories/GHSA-2pfh-q76x-gwvm

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/bootstrap b/bootstrap
index 4150b7ddcb..f9c65001e7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -156,7 +156,7 @@ fi
 # See https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.10.html#known-issues
 if [ -f "$VENV/bin/ansible" ]; then
     ansible_version=$($VENV/bin/pip list --format json | python3 -c "import sys; import json; print(list(filter(lambda i: i['name'] == 'ansible', json.loads(sys.stdin.read())))[0]['version'])")
-    uninstall_ansible=$(./$VENV/bin/python3 -c "from packaging.version import parse; print(parse('$ansible_version') < parse('2.10.0'))")
+    uninstall_ansible=$(./$VENV/bin/python3 -c "from packaging.version import parse; print(parse('$ansible_version') < parse('4.2.0'))")
     if [ "$uninstall_ansible" = "True" ]; then
         ./$VENV/bin/pip uninstall -y ansible ansible-base ansible-core
     fi
diff --git a/requirements.txt b/requirements.txt
index 1f82d1c4a4..735d64e4d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,9 +4,9 @@
 #
 #    pip-compile --extra=test pyproject.toml
 #
-ansible==2.10.7
+ansible==4.10.0
     # via teuthology (pyproject.toml)
-ansible-base==2.10.17
+ansible-core==2.11.11
     # via ansible
 apache-libcloud==3.3.1
     # via teuthology (pyproject.toml)
@@ -59,7 +59,7 @@ configparser==5.0.2
     # via teuthology (pyproject.toml)
 cryptography==3.4.7
     # via
-    #   ansible-base
+    #   ansible-core
     #   openstacksdk
     #   paramiko
     #   pyopenssl
@@ -122,7 +122,7 @@ iso8601==0.1.16
     #   python-novaclient
     #   python-openstackclient
 jinja2==3.0.1
-    # via ansible-base
+    # via ansible-core
 jmespath==0.10.0
     # via
     #   boto3
@@ -195,7 +195,7 @@ oslo.utils==4.12.2
     #   python-openstackclient
 packaging==21.0
     # via
-    #   ansible-base
+    #   ansible-core
     #   oslo.utils
     #   pytest
     #   tox
@@ -289,7 +289,7 @@ pytz==2021.1
     #   oslo.utils
 pyyaml==5.4.1
     # via
-    #   ansible-base
+    #   ansible-core
     #   cliff
     #   openstacksdk
     #   oslo.config
@@ -304,6 +304,8 @@ requests==2.27.1
     #   teuthology (pyproject.toml)
 requestsexceptions==1.4.0
     # via openstacksdk
+resolvelib==0.5.4
+    # via ansible-core
 rfc3986==1.5.0
     # via oslo.config
 s3transfer==0.5.2
diff --git a/setup.cfg b/setup.cfg
index 05737a641d..d8332e9b52 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,7 +32,7 @@ summary = Ceph test framework
 packages = find:
 install_requires =
     PyYAML
-    ansible>=2.10,<3.0
+    ansible>=4.2.0
     apache-libcloud
     argparse>=1.2.1
     backports.ssl-match-hostname