From 7fc88179dcb234a64b96837689f64c6cbfa94cfd Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <noonedeadpunk@ya.ru>
Date: Fri, 13 May 2022 10:54:09 +0200
Subject: [PATCH] Update documentation on role requirements

In README file we're refferencing plugins repo for installing
config_template from it. However, we're using module from it's
collection.
We're updating documentation along with renaming a-r-r to more common
requirements.yml and adjusting rc file
to drop not required overrides from there.

Change-Id: I7bf4c0fca678fd50be2dc041fe16efcc67c44fa5
Closes-Bug: #1961621
---
 README.md                      | 17 +++++++----------
 ansible-role-requirements.yaml |  4 ----
 manual-test.rc                 | 14 ++------------
 requirements.yml               |  5 +++++
 4 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 ansible-role-requirements.yaml
 create mode 100644 requirements.yml

diff --git a/README.md b/README.md
index 967a41a..d1f1ab0 100644
--- a/README.md
+++ b/README.md
@@ -2,20 +2,17 @@
 
 This Ansible role configures systemd mount files.
 
-This role requires the ``openstack-ansible-plugins`` repository to be available
-on your local system. The Ansible galaxy resolver will not retrieve this role
-for you. To get the plugins role in place clone the plugins repository
-**before** running this role.
+This role requires the ``ansible-config_template`` collection to be available
+on your local system.
+
+To get collection you can use use the ``ansible-galaxy`` command on the
+``requirements.yml`` file.. You need to install collection **before**
+running this role.
 
 ``` bash
-# git clone https://github.com/openstack/openstack-ansible-plugins /etc/ansible/roles/plugins
+# ansible-galaxy install -r requirements.yml
 ```
 
-You can also use the ``ansible-galaxy`` command on the ``ansible-role-requirements.yml`` file.
-
-``` bash
-# ansible-galaxy install -r ansible-role-requirements.yml
-```
 Release notes for the project can be found at:
   https://docs.openstack.org/releasenotes/ansible-role-systemd_mount
 
diff --git a/ansible-role-requirements.yaml b/ansible-role-requirements.yaml
deleted file mode 100644
index f3e53e7..0000000
--- a/ansible-role-requirements.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- name: "plugins"
-  src: "https://opendev.org/openstack/openstack-ansible-plugins"
-  scm: git
-  version: "master"
diff --git a/manual-test.rc b/manual-test.rc
index 7016c45..a3e9ec9 100644
--- a/manual-test.rc
+++ b/manual-test.rc
@@ -2,21 +2,11 @@ export VIRTUAL_ENV=$(pwd)
 export ANSIBLE_HOST_KEY_CHECKING=False
 export ANSIBLE_SSH_CONTROL_PATH=/tmp/%%h-%%r
 
-# TODO (odyssey4me) These are only here as they are non-standard folder
-# names for Ansible 1.9.x. We are using the standard folder names for
-# Ansible v2.x. We can remove this when we move to Ansible 2.x.
-export ANSIBLE_ACTION_PLUGINS=${HOME}/.ansible/plugins/action
-export ANSIBLE_CALLBACK_PLUGINS=${HOME}/.ansible/plugins/callback
-export ANSIBLE_FILTER_PLUGINS=${HOME}/.ansible/plugins/filter
-export ANSIBLE_LOOKUP_PLUGINS=${HOME}/.ansible/plugins/lookup
-
-# This is required as the default is the current path or a path specified
-# in ansible.cfg
-export ANSIBLE_LIBRARY=${HOME}/.ansible/plugins/library
-
 # This is required as the default is '/etc/ansible/roles' or a path
 # specified in ansible.cfg
 export ANSIBLE_ROLES_PATH=${HOME}/.ansible/roles:$(pwd)/..
+export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible:$(pwd)/.."
+export ANSIBLE_COLLECTIONS_PATH="${HOME}/.ansible:$(pwd)/.."
 
 export ANSIBLE_SSH_ARGS="-o ControlMaster=no \
   -o UserKnownHostsFile=/dev/null \
diff --git a/requirements.yml b/requirements.yml
new file mode 100644
index 0000000..58d02bb
--- /dev/null
+++ b/requirements.yml
@@ -0,0 +1,5 @@
+---
+collections:
+  - name: https://opendev.org/openstack/ansible-config_template
+    version: master
+    type: git