Merge "Switch to ansible-base 2.10.1 with collections"

ansible-collection-requirements.yml

@@ -2,3 +2,18 @@ collections:
   - name: openstack.cloud
     version: 1.0.0
     source: https://galaxy.ansible.com
+  - name: community.general
+    version: 1.1.0
+    source: https://galaxy.ansible.com
+  - name: community.rabbitmq
+    version: 1.0.1
+    source: https://galaxy.ansible.com
+  - name: community.mysql
+    version: 1.0.0
+    source: https://galaxy.ansible.com
+  - name: community.crypto
+    version: 1.1.1
+    source: https://galaxy.ansible.com
+  - name: openvswitch.openvswitch
+    version: 1.0.5
+    source: https://galaxy.ansible.com

scripts/bootstrap-ansible.sh

@@ -22,7 +22,7 @@ set -e -u -x
 export HTTP_PROXY=${HTTP_PROXY:-""}
 export HTTPS_PROXY=${HTTPS_PROXY:-""}
 # The Ansible version used for testing
-export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible==2.9.13"}
+export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible-base==2.10.1"}
 export ANSIBLE_ROLE_FILE=${ANSIBLE_ROLE_FILE:-"ansible-role-requirements.yml"}
 export ANSIBLE_COLLECTION_FILE=${ANSIBLE_COLLECTION_FILE:-"ansible-collection-requirements.yml"}
 export USER_ROLE_FILE=${USER_ROLE_FILE:-"user-role-requirements.yml"}
@@ -186,6 +186,7 @@ if [ -f "${ANSIBLE_ROLE_FILE}" ] && [[ -z "${SKIP_OSA_ROLE_CLONE+defined}" ]]; t
     export ANSIBLE_VARS_PLUGINS="/dev/null"
     export ANSIBLE_STRATEGY_PLUGINS="/dev/null"
     export ANSIBLE_CONFIG="none-ansible.cfg"
+    export ANSIBLE_COLLECTIONS_PATH="/etc/ansible"
 
     pushd scripts
       /opt/ansible-runtime/bin/ansible-playbook get-ansible-role-requirements.yml \
@@ -202,6 +203,7 @@ if [ -f "${ANSIBLE_ROLE_FILE}" ] && [[ -z "${SKIP_OSA_ROLE_CLONE+defined}" ]]; t
     unset ANSIBLE_VARS_PLUGINS
     unset ANSIBLE_STRATEGY_PLUGINS
     unset ANSIBLE_CONFIG
+    unset ANSIBLE_COLLECTIONS_PATH
 fi
 
 echo "System is bootstrapped and ready for use."