From d0f72c604011886a15c11db989cfac6d3e52cfec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 9 Jun 2020 21:16:07 +0200 Subject: [PATCH] Do not require kolla-ansible to be installed Stein only. It seems the checks backport was not amended properly for Stein. The installation requirement is only present (and documented) since Train. Change-Id: I1c723fb2b89adf48cba856beaac85cab37f07695 Closes-bug: #1882780 --- releasenotes/notes/bug-1882780-4e71976ce57a0d7c.yaml | 5 +++++ tools/kolla-ansible | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 releasenotes/notes/bug-1882780-4e71976ce57a0d7c.yaml diff --git a/releasenotes/notes/bug-1882780-4e71976ce57a0d7c.yaml b/releasenotes/notes/bug-1882780-4e71976ce57a0d7c.yaml new file mode 100644 index 0000000000..a39c2898a3 --- /dev/null +++ b/releasenotes/notes/bug-1882780-4e71976ce57a0d7c.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Do not require kolla-ansible to be installed (Stein only). + `LP#1882780 `__ diff --git a/tools/kolla-ansible b/tools/kolla-ansible index 3b5e22c4f9..858037df11 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -29,13 +29,6 @@ function check_environment_coherence { exit 1 fi - # Check for existence of kolla_ansible module using Ansible's Python. - if ! $ansible_python_cmdline -c 'import kolla_ansible' &>/dev/null; then - echo "ERROR: kolla_ansible has to be available in the Ansible PYTHONPATH." >&2 - echo "Please install both in the same (virtual) environment." >&2 - exit 1 - fi - local ansible_version_output ansible_full_version=$($ansible_python_cmdline -c 'import ansible; print(ansible.__version__)')