From dbd36eebc769b4b8aa3134015cf543af6035d660 Mon Sep 17 00:00:00 2001
From: Sagi Shnaidman <sshnaidm@redhat.com>
Date: Mon, 8 Nov 2021 13:05:49 +0200
Subject: [PATCH] Run CI with Ansible 2.11 (extras)

Depends-On: https://review.opendev.org/c/openstack/tripleo-quickstart/+/769480

Change-Id: I1669faf68853e75ef36a87feb5f1c083d15da804
---
 .pre-commit-config.yaml                 | 2 +-
 molecule-requirements.txt               | 2 +-
 roles/overcloud-deploy/requirements.txt | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 roles/overcloud-deploy/requirements.txt

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 179c7fb99..3aac5779a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -38,7 +38,7 @@ repos:
         # plugins is the standard collection dir for modules
         entry: env ANSIBLE_LIBRARY=plugins ansible-lint --force-color -p -v
         additional_dependencies:
-          - 'ansible<2.10'
+          - 'ansible-core>=2.11,<2.12'
   - repo: https://github.com/openstack-dev/bashate.git
     rev: 2.0.0
     hooks:
diff --git a/molecule-requirements.txt b/molecule-requirements.txt
index e52957c7d..9785246ce 100644
--- a/molecule-requirements.txt
+++ b/molecule-requirements.txt
@@ -1,4 +1,4 @@
-ansible<2.10
+ansible-core>=2.11,<2.12
 ansi2html  # GPL (soft-dependency of pytest-html)
 docker
 paramiko>=2.5.0  # LGPL (soft-dependency of docker that enables ssh protocol)
diff --git a/roles/overcloud-deploy/requirements.txt b/roles/overcloud-deploy/requirements.txt
deleted file mode 100644
index 729b89c9e..000000000
--- a/roles/overcloud-deploy/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-pbr>=1.6
-ansible==2.0.0