From 065812b3454384b57076c847a6dea922d4409d51 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 21 Sep 2020 18:11:28 +0300 Subject: [PATCH] Use ansible_distribution_major_version in variables In order to collect variables, it's worth using ansible_distribution_major_version as ansible_distribution_version changes behaviour between ansible releases, ie [1] This causes CentOS jobs fail with 2.8.13, as ansible_distribution_version there is '7.8' [2] [1] https://github.com/ansible/ansible/issues/57463 [2] https://zuul.opendev.org/t/openstack/build/e5ae88e08ac546ccb0e7ab99f8f0a051/log/zuul-info/host-info.centos-7.yaml#141 --- tasks/variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/variables.yml b/tasks/variables.yml index 4d61ce3..cd630e4 100644 --- a/tasks/variables.yml +++ b/tasks/variables.yml @@ -19,7 +19,7 @@ files: - "{{ ansible_distribution }}_{{ ansible_distribution_lts_version }}.yml" - "{{ ansible_distribution }}.yml" - - "{{ ansible_os_family }}_{{ ansible_distribution_version }}.yml" + - "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml" - "{{ ansible_os_family }}.yml" - default.yml paths: