From b30094a6545ae75654eca24ee02c5b63e87cc517 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 10 Mar 2021 12:16:40 +0000 Subject: [PATCH] Remove references to unsupported operating systems All references to Gentoo, SUSE, Debian stretch and Centos-7 are removed. Conditional tasks, ternary operators and variables are simplified where possible OS specific variables files are generalised where possible Change-Id: Ie84846f8590c3ae60afd671d973a4de3c644d526 --- meta/main.yml | 2 +- tasks/tempest_install.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index 4be4ee42..d862e955 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -23,7 +23,7 @@ galaxy_info: platforms: - name: Debian versions: - - stretch + - buster - name: Ubuntu versions: - bionic diff --git a/tasks/tempest_install.yml b/tasks/tempest_install.yml index c7fdb526..f0551b08 100644 --- a/tasks/tempest_install.yml +++ b/tasks/tempest_install.yml @@ -18,7 +18,7 @@ package: name: "{{ tempest_package_list }}" state: "{{ tempest_package_state }}" - update_cache: "{{ (ansible_facts['pkg_mgr'] in ['apt', 'zypper']) | ternary('yes', omit) }}" + update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}" cache_valid_time: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary(cache_timeout, omit) }}" register: install_packages until: install_packages is success