From b58dbee2ad80c0f5916476a9e1e0a13a67c6eff6 Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <dmitriy.rabotyagov@citynetwork.eu>
Date: Tue, 30 Nov 2021 15:24:58 +0200
Subject: [PATCH] Remove retrievement of config_tempalte as a module

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_tempest/+/819876
Change-Id: I30b4fd5e2811114e199943a766afb0c861a0e872
---
 ansible-role-requirements.yml                          |  5 -----
 scripts/openstack-ansible.rc                           |  4 ++--
 .../roles/bootstrap-host/tasks/prepare_aio_config.yml  | 10 +++++-----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index 15c829de37..452048418b 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -8,11 +8,6 @@
   src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
   version: master
   trackbranch: master
-- name: config_template
-  scm: git
-  src: https://opendev.org/openstack/ansible-config_template
-  version: master
-  trackbranch: master
 - name: galera_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-galera_server
diff --git a/scripts/openstack-ansible.rc b/scripts/openstack-ansible.rc
index 98bda9f28c..887b149826 100644
--- a/scripts/openstack-ansible.rc
+++ b/scripts/openstack-ansible.rc
@@ -26,10 +26,10 @@ export ANSIBLE_ROLES_PATH="${ANSIBLE_ROLES_PATH:-/etc/ansible/roles:OSA_PLAYBOOK
 export ANSIBLE_COLLECTIONS_PATHS="${ANSIBLE_COLLECTIONS_PATHS:-/etc/ansible}"
 export ANSIBLE_COLLECTIONS_PATH="${ANSIBLE_COLLECTIONS_PATH:-/etc/ansible}"
 
-export ANSIBLE_LIBRARY="${ANSIBLE_LIBRARY:-OSA_PLAYBOOK_PATH/library:/etc/ansible/roles/config_template/library:/etc/ansible/roles/plugins/library:/etc/ansible/roles/ceph-ansible/library}"
+export ANSIBLE_LIBRARY="${ANSIBLE_LIBRARY:-OSA_PLAYBOOK_PATH/library:/etc/ansible/roles/plugins/library:/etc/ansible/roles/ceph-ansible/library}"
 export ANSIBLE_LOOKUP_PLUGINS="${ANSIBLE_LOOKUP_PLUGINS:-/etc/ansible/roles/plugins/lookup}"
 export ANSIBLE_FILTER_PLUGINS="${ANSIBLE_FILTER_PLUGINS:-/etc/ansible/roles/plugins/filter:/etc/ansible/roles/ceph-ansible/plugins/filter}"
-export ANSIBLE_ACTION_PLUGINS="${ANSIBLE_ACTION_PLUGINS:-/etc/ansible/roles/config_template/action:/etc/ansible/roles/plugins/action:/etc/ansible/roles/ceph-ansible/plugins/actions}"
+export ANSIBLE_ACTION_PLUGINS="${ANSIBLE_ACTION_PLUGINS:-/etc/ansible/roles/plugins/action:/etc/ansible/roles/ceph-ansible/plugins/actions}"
 export ANSIBLE_CALLBACK_PLUGINS="${ANSIBLE_CALLBACK_PLUGINS:-/etc/ansible/roles/plugins/callback:/etc/ansible/roles/ceph-ansible/plugins/callback}"
 export ANSIBLE_TEST_PLUGINS="${ANSIBLE_TEST_PLUGINS:-/etc/ansible/roles/plugins/test}"
 export ANSIBLE_VARS_PLUGINS="${ANSIBLE_VARS_PLUGINS:-/etc/ansible/roles/plugins/vars_plugins}"
diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
index e385595abb..306d8be69b 100644
--- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
+++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml
@@ -28,7 +28,7 @@
   with_items: "{{ bootstrap_host_scenarios_expanded }}"
 
 - name: Deploy user conf.d configuration
-  config_template:
+  openstack.config_template.config_template:
     src: "{{ bootstrap_host_aio_config_path }}/conf.d/{{ item.item }}.yml.aio"
     dest: "/etc/openstack_deploy/conf.d/{{ item.item }}.yml"
     config_overrides: "{{ item.item.override | default({}) }}"
@@ -42,7 +42,7 @@
     - deploy-confd
 
 - name: Deploy openstack_user_config
-  config_template:
+  openstack.config_template.config_template:
     src: "{{ bootstrap_host_aio_config_path }}/openstack_user_config.yml.aio.j2"
     dest: "/etc/openstack_deploy/openstack_user_config.yml"
     config_overrides: "{{ openstack_user_config_overrides | default({}) }}"
@@ -52,7 +52,7 @@
     - deploy-openstack-user-config
 
 - name: Deploy user_secrets file
-  config_template:
+  openstack.config_template.config_template:
     src: "{{ bootstrap_host_aio_config_path }}/user_secrets.yml"
     dest: "/etc/openstack_deploy/{{ bootstrap_host_user_secrets_filename }}"
     config_overrides: "{{ user_secrets_overrides | default({}) }}"
@@ -127,7 +127,7 @@
   when: ansible_facts['os_family'] | lower == 'redhat'
 
 - name: Set the user_variables
-  config_template:
+  openstack.config_template.config_template:
     src: "{{ bootstrap_user_variables_template }}"
     dest: "/etc/openstack_deploy/{{ bootstrap_host_user_variables_filename }}"
     config_overrides: "{{ user_variables_overrides | default({}) }}"
@@ -141,7 +141,7 @@
     - "lookup('env', 'http_proxy')|length > 0"
 
 - name: Drop the extra user_variables files for this scenario
-  config_template:
+  openstack.config_template.config_template:
     src: "{{ item.src }}"
     dest: "/etc/openstack_deploy/{{ item.dest }}"
     config_overrides: "{{ item.config_overrides | default({}) }}"