Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Use package module to install distro packages
Browse files Browse the repository at this point in the history
Consolidate distro package install tasks into a single task using the
package module and pass the package list into the name instead of using
a with_items loop.

The lxc package is no longer a dependency of lxc-dev, so the task to
override lxc-net is no longer necessary and would not effect a systemd
service anyway.

The minimum Ansible version is raised to 2.2 due to a
known bug [1] in Ansible's apt module which does not
update the cache properly if the cache update and the
install are combined in a single task.

[1] ansible/ansible-modules-core#1497

Change-Id: I0b1b5e5413aa3d4496f15f64e3673f4229bbe237
(cherry picked from commit 9dfb01f)
  • Loading branch information
jimmymccrory authored and Jesse Pretorius (odyssey4me) committed May 15, 2017
1 parent 6d00b7d commit 0a50268
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 75 deletions.
2 changes: 1 addition & 1 deletion meta/main.yml
Expand Up @@ -18,7 +18,7 @@ galaxy_info:
description: Install package repo build
company: Rackspace
license: Apache2
min_ansible_version: 1.9.3
min_ansible_version: 2.2
platforms:
- name: Ubuntu
versions:
Expand Down
38 changes: 0 additions & 38 deletions tasks/install-apt.yml

This file was deleted.

26 changes: 0 additions & 26 deletions tasks/install-yum.yml

This file was deleted.

22 changes: 12 additions & 10 deletions tasks/repo_build_install.yml
Expand Up @@ -13,14 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.

- include: install-apt.yml
static: no
when: ansible_pkg_mgr == 'apt'
- name: Install packages
package:
name: "{{ repo_build_distro_packages }}"
state: "{{ repo_build_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
delay: 2
tags:
- install-apt

- include: install-yum.yml
static: no
when: ansible_pkg_mgr == 'yum'
tags:
- install-yum
- repo-build-apt-packages
- repo-build-yum-packages

0 comments on commit 0a50268

Please sign in to comment.