From ddcd66c2d2a1a626759b4bf98dae58b7d31c21a6 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Wed, 31 May 2023 14:23:52 +0100
Subject: [PATCH] Upgrade `ansible` and `ansible-core`

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 requirements/static/ci/linux.in         | 2 +-
 requirements/static/ci/py3.10/linux.txt | 4 ++--
 requirements/static/ci/py3.11/linux.txt | 4 ++--
 requirements/static/ci/py3.8/linux.txt  | 4 ++--
 requirements/static/ci/py3.9/linux.txt  | 6 ++++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/requirements/static/ci/linux.in b/requirements/static/ci/linux.in
index 34c2c054a27..c8fbbdd5a21 100644
--- a/requirements/static/ci/linux.in
+++ b/requirements/static/ci/linux.in
@@ -6,7 +6,7 @@ pygit2<1.1.0; python_version <= '3.8'
 pygit2>=1.4.0; python_version > '3.8'
 pygit2==1.9.1; python_version >= '3.10'
 pymysql>=1.0.2
-ansible>=4.4.0; python_version < '3.9'
+ansible>=4.4.0,<5.0.1; python_version <= '3.8'
 ansible>=7.0.0; python_version >= '3.9'
 twilio
 python-telegram-bot>=13.7
diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt
index cfa5250b8ac..b74c504dd5f 100644
--- a/requirements/static/ci/py3.10/linux.txt
+++ b/requirements/static/ci/py3.10/linux.txt
@@ -8,9 +8,9 @@ aiohttp==3.8.1
     # via etcd3-py
 aiosignal==1.2.0
     # via aiohttp
-ansible-core==2.14.1
+ansible-core==2.15.0
     # via ansible
-ansible==7.1.0 ; python_version >= "3.9"
+ansible==8.0.0 ; python_version >= "3.9"
     # via -r requirements/static/ci/linux.in
 apache-libcloud==2.5.0 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt
index 5e47e9a7412..27792f9390b 100644
--- a/requirements/static/ci/py3.11/linux.txt
+++ b/requirements/static/ci/py3.11/linux.txt
@@ -8,9 +8,9 @@ aiohttp==3.8.1
     # via etcd3-py
 aiosignal==1.2.0
     # via aiohttp
-ansible-core==2.14.1
+ansible-core==2.15.0
     # via ansible
-ansible==7.1.0 ; python_version >= "3.9"
+ansible==8.0.0 ; python_version >= "3.9"
     # via -r requirements/static/ci/linux.in
 apache-libcloud==2.5.0 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt
index 58bcc3d0df7..72474cf6617 100644
--- a/requirements/static/ci/py3.8/linux.txt
+++ b/requirements/static/ci/py3.8/linux.txt
@@ -8,9 +8,9 @@ aiohttp==3.8.1
     # via etcd3-py
 aiosignal==1.2.0
     # via aiohttp
-ansible-core==2.11.7
+ansible-core==2.11.12
     # via ansible
-ansible==4.4.0 ; python_version < "3.9"
+ansible==4.10.0 ; python_version <= "3.8"
     # via -r requirements/static/ci/linux.in
 apache-libcloud==2.5.0 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt
index 425b995f867..d54424246ba 100644
--- a/requirements/static/ci/py3.9/linux.txt
+++ b/requirements/static/ci/py3.9/linux.txt
@@ -8,9 +8,9 @@ aiohttp==3.8.1
     # via etcd3-py
 aiosignal==1.2.0
     # via aiohttp
-ansible-core==2.14.1
+ansible-core==2.15.0
     # via ansible
-ansible==7.1.0 ; python_version >= "3.9"
+ansible==8.0.0 ; python_version >= "3.9"
     # via -r requirements/static/ci/linux.in
 apache-libcloud==2.5.0 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
@@ -176,6 +176,8 @@ importlib-metadata==6.6.0
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
     #   -r requirements/static/pkg/linux.in
+importlib-resources==5.0.7
+    # via ansible-core
 inflect==6.0.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt