From cd13bde880811f35b7ce1627bc4261f3bf201979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Wed, 27 Oct 2021 19:16:35 +0000
Subject: [PATCH] Fix missing Ansible version in the error message
Change-Id: Iefa8f78142c502ac9e8ebdbb95c94b2b05f99e5b
Closes-Bug: #1948979
---
releasenotes/notes/bug-1948979-aaf2a93cc016ffb1.yaml | 5 +++++
tools/kolla-ansible | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 releasenotes/notes/bug-1948979-aaf2a93cc016ffb1.yaml
diff --git a/releasenotes/notes/bug-1948979-aaf2a93cc016ffb1.yaml b/releasenotes/notes/bug-1948979-aaf2a93cc016ffb1.yaml
new file mode 100644
index 0000000000..e90918beab
--- /dev/null
+++ b/releasenotes/notes/bug-1948979-aaf2a93cc016ffb1.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Fixes missing current Ansible version in the error message.
+ `LP#1948979 <https://launchpad.net/bugs/1948979>`__
diff --git a/tools/kolla-ansible b/tools/kolla-ansible
index 36c04656fb..4b4813777c 100755
--- a/tools/kolla-ansible
+++ b/tools/kolla-ansible
@@ -60,7 +60,7 @@ function check_environment_coherence {
if [[ $(printf "%s\n" "$ANSIBLE_VERSION_MIN" "$ANSIBLE_VERSION_MAX" "$ansible_version" | sort -V | head -n1) != "$ANSIBLE_VERSION_MIN" ]] ||
[[ $(printf "%s\n" "$ANSIBLE_VERSION_MIN" "$ANSIBLE_VERSION_MAX" "$ansible_version" | sort -V | tail -n1) != "$ANSIBLE_VERSION_MAX" ]]; then
- echo "ERROR: Ansible version should be between $ANSIBLE_VERSION_MIN and $ANSIBLE_VERSION_MAX. Current version is $ANSIBLE_VERSION_HOST which is not supported."
+ echo "ERROR: Ansible version should be between $ANSIBLE_VERSION_MIN and $ANSIBLE_VERSION_MAX. Current version is $ansible_full_version which is not supported."
exit 1
fi
}
--
GitLab