diff --git a/meta/main.yml b/meta/main.yml index f2a8ae71..6b5ff21a 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -18,7 +18,7 @@ galaxy_info: description: Installation and setup of neutron company: Rackspace license: Apache2 - min_ansible_version: 2.0 + min_ansible_version: 2.2 platforms: - name: Ubuntu versions: diff --git a/tasks/neutron_install.yml b/tasks/neutron_install.yml index 7e812e0a..308af07c 100644 --- a/tasks/neutron_install.yml +++ b/tasks/neutron_install.yml @@ -13,17 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Ensure apt cache is up to date - apt: - update_cache: yes - cache_valid_time: "{{ cache_timeout }}" - when: - - ansible_pkg_mgr == 'apt' - - name: Install neutron role packages package: name: "{{ item }}" state: "{{ neutron_package_state }}" + update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" + cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}" with_items: - "{{ neutron_packages_list | selectattr('enabled') | sum(attribute='packages', start=[]) }}" when: