From 7fec254f6260cc7646d2eff1aa6b0dbc0c3f0e85 Mon Sep 17 00:00:00 2001
From: Kenichi Omichi <ken1ohmichi@gmail.com>
Date: Thu, 2 Mar 2023 18:54:58 +0900
Subject: [PATCH] Drop part for supporting ansible 2.9 and 2.10 (#9842)
requirements-$ANSIBLE_VERSION.yml doesn't exist in Kubespray repo.
That was for supporting ansible 2.10-, and now Kubespray supports
2.11+. So this drops the part to avoid confusion.
---
docs/ansible.md | 3 ---
tests/scripts/testcases_prepare.sh | 7 -------
2 files changed, 10 deletions(-)
diff --git a/docs/ansible.md b/docs/ansible.md
index 5ba791e76..ad088ec0a 100644
--- a/docs/ansible.md
+++ b/docs/ansible.md
@@ -15,9 +15,6 @@ virtualenv --python=$(which python3) $VENVDIR
source $VENVDIR/bin/activate
cd $KUBESPRAYDIR
pip install -U -r requirements-$ANSIBLE_VERSION.txt
-test -f requirements-$ANSIBLE_VERSION.yml && \
- ansible-galaxy role install -r requirements-$ANSIBLE_VERSION.yml && \
- ansible-galaxy collection -r requirements-$ANSIBLE_VERSION.yml
```
### Ansible Python Compatibility
diff --git a/tests/scripts/testcases_prepare.sh b/tests/scripts/testcases_prepare.sh
index de36f492f..ff27561a4 100755
--- a/tests/scripts/testcases_prepare.sh
+++ b/tests/scripts/testcases_prepare.sh
@@ -9,10 +9,3 @@ mkdir -p /.ssh
mkdir -p cluster-dump
mkdir -p $HOME/.ssh
ansible-playbook --version
-
-# in some cases we may need to bring in collections or roles from ansible-galaxy
-# to compensate for missing functionality in older ansible versions
-if [ -f requirements-${ANSIBLE_MAJOR_VERSION}.yml ] ; then
- ansible-galaxy role install -r requirements-${ANSIBLE_MAJOR_VERSION}.yml
- ansible-galaxy collection install -r requirements-${ANSIBLE_MAJOR_VERSION}.yml
-fi
--
GitLab