diff --git a/meta/main.yml b/meta/main.yml index f3b1d88..8942a04 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -4,7 +4,7 @@ galaxy_info: description: Deploy Trove with OpenStack Ansible company: OpenStack license: Apache-2.0 - min_ansible_version: 2.0 + min_ansible_version: 2.2 version: 0.1.0 platforms: - name: Ubuntu diff --git a/tasks/trove_install.yml b/tasks/trove_install.yml index 325840a..53eebe8 100644 --- a/tasks/trove_install.yml +++ b/tasks/trove_install.yml @@ -16,17 +16,12 @@ # (c) 2016 Donovan Francesco # (c) 2016 Paul Stevens -- name: Ensure apt cache is up to date - apt: - update_cache: yes - cache_valid_time: "{{ cache_timeout }}" - when: - - ansible_pkg_mgr == 'apt' - - name: Install distro packages package: name: "{{ item }}" state: "{{ trove_package_state }}" + update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" + cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}" register: install_packages until: install_packages|success retries: 5