summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-02-17 19:29:56 +0000
committerGerrit Code Review <review@openstack.org>2023-02-17 19:29:56 +0000
commitd912d9cd7d8be23e03e1556349a7ec58a15348ec (patch)
tree1b6b4456ed00b7e565d6a4b83e0757129ce36ca3
parent349bf45a3c7b0a31950a9a12ae6944ddf251e4f2 (diff)
parent39cf3daca496a2f6b18d6e8b50d532e86c5384fe (diff)
downloadzuul-d912d9cd7d8be23e03e1556349a7ec58a15348ec.tar.gz
Merge "Allow default-ansible-version to be an int"
-rw-r--r--zuul/configloader.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/zuul/configloader.py b/zuul/configloader.py
index f9e52595e..fe22fe0f8 100644
--- a/zuul/configloader.py
+++ b/zuul/configloader.py
@@ -1733,7 +1733,7 @@ class TenantParser(object):
'disallowed-labels': to_list(str),
'allow-circular-dependencies': bool,
'default-parent': str,
- 'default-ansible-version': vs.Any(str, float),
+ 'default-ansible-version': vs.Any(str, float, int),
'access-rules': to_list(str),
'admin-rules': to_list(str),
'semaphores': to_list(str),
@@ -1818,8 +1818,8 @@ class TenantParser(object):
# Set default ansible version
default_ansible_version = conf.get('default-ansible-version')
if default_ansible_version is not None:
- # The ansible version can be interpreted as float by yaml so make
- # sure it's a string.
+ # The ansible version can be interpreted as float or int
+ # by yaml so make sure it's a string.
default_ansible_version = str(default_ansible_version)
ansible_manager.requestVersion(default_ansible_version)
else: