From a52b8314198819cfdabfc9c91d9ba40922c1abec Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Mon, 27 Jul 2020 12:26:38 +0200
Subject: [PATCH] Change to "collections" where needed

We should keep the name "collections" for consistency.

Change-Id: I98aab593ffcaf688e9d94e4fa16794c6d313e6c8
---
 ...requirements.yml => ansible-collections-requirements.yml | 0
 scripts/env-setup.sh                                        | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename ansible-collection-requirements.yml => ansible-collections-requirements.yml (100%)

diff --git a/ansible-collection-requirements.yml b/ansible-collections-requirements.yml
similarity index 100%
rename from ansible-collection-requirements.yml
rename to ansible-collections-requirements.yml
diff --git a/scripts/env-setup.sh b/scripts/env-setup.sh
index aa61f0e8f..cfa4a167f 100755
--- a/scripts/env-setup.sh
+++ b/scripts/env-setup.sh
@@ -7,7 +7,7 @@ set -eu
 
 DEFAULT_PIP_ANSIBLE='>=2.9,<2.10'
 
-ANSIBLE_COLLECTION_REQ=${ANSIBLE_COLLECTION_REQ:-$(dirname $0)/../ansible-collection-requirements.yml}
+ANSIBLE_COLLECTIONS_REQ=${ANSIBLE_COLLECTIONS_REQ:-$(dirname $0)/../ansible-collections-requirements.yml}
 ANSIBLE_COLLECTION_SOURCE_PATH=
 if [[ -d "${WORKSPACE:-}/openstack/ansible-collections-openstack" ]]; then
     ANSIBLE_COLLECTION_SOURCE_PATH="${WORKSPACE}/openstack/ansible-collections-openstack"
@@ -56,10 +56,10 @@ if [[ -n "$ANSIBLE_COLLECTION_SOURCE_PATH" ]]; then
     echo "Using openstack ansible collection from $ANSIBLE_COLLECTION_SOURCE_PATH"
 elif [[ -z $BIFROST_COLLECTIONS_PATHS ]]; then
     echo "Installing ansible collections on default collections path"
-    ${ANSIBLE_GALAXY} collection install -r ${ANSIBLE_COLLECTION_REQ}
+    ${ANSIBLE_GALAXY} collection install -r ${ANSIBLE_COLLECTIONS_REQ}
 else
     echo "Installing ansible collections on $BIFROST_COLLECTIONS_PATHS"
-    ${ANSIBLE_GALAXY} collection install -r ${ANSIBLE_COLLECTION_REQ} -p ${BIFROST_COLLECTIONS_PATHS}
+    ${ANSIBLE_GALAXY} collection install -r ${ANSIBLE_COLLECTIONS_REQ} -p ${BIFROST_COLLECTIONS_PATHS}
 fi
 
 # Symlink Collections to the playbook directory. This removes the need of setting