Use package module to install distro packages

Consolidate distro package install tasks into a single taskfile using
the package module.

Change-Id: I6626132d8a22d07574826dde2e51bcfd79f116d9

meta/main.yml

@@ -18,7 +18,7 @@ galaxy_info:
   description: Installation and setup of memcached
   company: Rackspace
   license: Apache2
-  min_ansible_version: 1.6.6
+  min_ansible_version: 2.0
   platforms:
     - name: Ubuntu
       versions:

tasks/install-apt.yml

@@ -1,37 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Install apt packages
-  apt:
-    pkg: "{{ item }}"
-    state: "{{ memcached_package_state }}"
-    update_cache: yes
-    cache_valid_time: "{{ cache_timeout }}"
-  register: install_packages
-  until: install_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ memcached_distro_packages }}"
-
-- name: Install apt packages for testing
-  apt:
-    pkg: "{{ item }}"
-    state: "{{ memcached_package_state }}"
-  register: install_test_packages
-  until: install_test_packages|success
-  retries: 5
-  delay: 2
-  with_items: "{{ memcached_test_distro_packages }}"
-  when: install_test_packages|bool

tasks/install-yum.yml

@@ -1,44 +0,0 @@
----
-# Copyright 2016, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: yum clean all
-  command: "/usr/bin/yum clean all"
-  register: yum_clean
-  until: yum_clean | success
-  retries: 5
-  delay: 2
-  tags:
-    - skip_ansible_lint
-
-- name: Install yum packages
-  yum:
-    pkg: "{{ item }}"
-    state: "{{ memcached_package_state }}"
-  register: install_yum_packages
-  until: install_yum_packages | success
-  retries: 5
-  delay: 2
-  with_items: "{{ memcached_distro_packages }}"
-
-- name: Install yum packages for testing
-  yum:
-    pkg: "{{ item }}"
-    state: "{{ memcached_package_state }}"
-  register: install_yum_test_packages
-  until: install_yum_test_packages | success
-  retries: 5
-  delay: 2
-  with_items: "{{ memcached_test_distro_packages }}"
-  when: install_test_packages|bool

tasks/install-zypper.yml

@@ -1,35 +0,0 @@
----
-# Copyright 2017, SUSE LINUX GmbH.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Install zypper packages
-  zypper:
-    name: "{{ item }}"
-    state: "{{ memcached_package_state }}"
-  register: install_zypper_packages
-  until: install_zypper_packages | success
-  retries: 5
-  delay: 2
-  with_items: "{{ memcached_distro_packages }}"
-
-- name: Install zypper packages for testing
-  zypper:
-    name: "{{ item }}"
-    state: "{{ memcached_package_state }}"
-  register: install_zypper_test_packages
-  until: install_zypper_test_packages | success
-  retries: 5
-  delay: 2
-  with_items: "{{ memcached_test_distro_packages }}"
-  when: install_test_packages|bool

tasks/memcached_install.yml

@@ -13,5 +13,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: install-{{ ansible_pkg_mgr }}.yml
-  static: no
+- name: Ensure apt cache is up to date
+  apt:
+    update_cache: yes
+    cache_valid_time: "{{ cache_timeout }}"
+  when:
+    - ansible_pkg_mgr == 'apt'
+
+- name: Install memcached packages
+  package:
+    name: "{{ item }}"
+    state: "{{ memcached_package_state }}"
+  register: install_packages
+  until: install_packages | success
+  retries: 5
+  delay: 2
+  with_items: "{{ memcached_distro_packages }}"
+
+- name: Install memcached packages for testing
+  package:
+    name: "{{ item }}"
+    state: "{{ memcached_package_state }}"
+  register: install_test_packages
+  until: install_test_packages | success
+  retries: 5
+  delay: 2
+  with_items: "{{ memcached_test_distro_packages }}"
+  when: install_test_packages | bool