From 851a548a53a8bb784fdf64b29751b507a388b02c Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Wed, 5 May 2021 16:56:36 +0530 Subject: [PATCH] Remove tripleo-ansible dependency tripleo-ansible is getting installed in TQ venv via TQE requirements.txt file. We are removing that requirements. During installation of tripleo-ansible in venv via pip causes issues with other packages leading to various module import failure. It also blocks content provider job as it uses podman_container.py module to deploy the content provider registry. In order to fix all these, we can use the same module from tripleo-ansible rpm deployed using repo setup and expose it ansible via ansible.cfg library path. Closes-Bug: #1927171 Signed-off-by: Chandan Kumar (raukadah) Depends-On: https://review.opendev.org/c/openstack/tripleo-ci/+/789937 Change-Id: I37ef9d381e208b5d3cbee4c88bafb2fcf5b4d86d --- ansible.cfg | 2 +- quickstart-extras-requirements.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index f674dafe0..8036015af 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -15,7 +15,7 @@ interpreter_python = auto # Attempt to load custom modules whether it's installed system-wide or from a virtual environment callback_plugins = /usr/lib/python2.7/site-packages/ara/plugins/callbacks:$VIRTUAL_ENV/lib/python2.7/site-packages/ara/plugins/callbacks:$VIRTUAL_ENV/lib/python3.6/site-packages/ara/plugins/callbacks:/usr/local/lib/python2.7/dist-packages/ara/plugins/callbacks test_plugins = /usr/lib/python2.7/site-packages/tripleo-quickstart/test_plugins:$VIRTUAL_ENV/usr/local/share/tripleo-quickstart/test_plugins:test_plugins -library = /usr/lib/python2.7/site-packages/tripleo-quickstart/library:$VIRTUAL_ENV/usr/local/share/tripleo-quickstart/library:library:$VIRTUAL_ENV/share/ansible/plugins/modules +library = /usr/lib/python2.7/site-packages/tripleo-quickstart/library:$VIRTUAL_ENV/usr/local/share/tripleo-quickstart/library:library:$VIRTUAL_ENV/share/ansible/plugins/modules:/usr/share/ansible/plugins/modules module_utils = $VIRTUAL_ENV/share/ansible/plugins/module_utils:/usr/share/ansible/plugins/module_utils roles_path = roles:$VIRTUAL_ENV/usr/local/share/tripleo-quickstart/roles:$VIRTUAL_ENV/usr/local/share/ansible/roles:$VIRTUAL_ENV/usr/local/share/opstools-ansible/roles:$VIRTUAL_ENV/share/ansible/roles:$VIRTUAL_ENV/usr/share/ansible/roles:/usr/share/ansible/roles collections_paths = collections:$VIRTUAL_ENV/share/ansible/collections:$VIRTUAL_ENV/share/ansible/collections/ansible_collections diff --git a/quickstart-extras-requirements.txt b/quickstart-extras-requirements.txt index 560921a88..d1ab25981 100644 --- a/quickstart-extras-requirements.txt +++ b/quickstart-extras-requirements.txt @@ -10,7 +10,6 @@ git+https://opendev.org/openstack/openstack-tempest-skiplist/#egg=openstack-temp git+https://opendev.org/openstack/tripleo-operator-ansible/#egg=tripleo-operator-ansible git+https://opendev.org/openstack/ansible-collections-openstack/#egg=ansible-collections-openstack.cloud git+https://opendev.org/openstack/tripleo-ci/#egg=tripleo-ci -git+https://opendev.org/openstack/tripleo-ansible/#egg=tripleo-ansible # NOTE: tripleo-ansible, tripleo-ipa are required for some jobs # (including standalone deployed with TLS). # The user is expected to install those repos manually as they are