Use package module to install distro packages
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] https://github.com/ansible/ansible-modules-core/issues/1497 Change-Id: I0b1b5e5413aa3d4496f15f64e3673f4229bbe237
This commit is contained in:
parent
509f26b41b
commit
9dfb01f0ce
|
@ -18,7 +18,7 @@ galaxy_info:
|
||||||
description: Install package repo build
|
description: Install package repo build
|
||||||
company: Rackspace
|
company: Rackspace
|
||||||
license: Apache2
|
license: Apache2
|
||||||
min_ansible_version: 1.9.3
|
min_ansible_version: 2.2
|
||||||
platforms:
|
platforms:
|
||||||
- name: Ubuntu
|
- name: Ubuntu
|
||||||
versions:
|
versions:
|
||||||
|
|
|
@ -1,38 +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: Drop lxc-net override file
|
|
||||||
template:
|
|
||||||
src: manual-init.override.j2
|
|
||||||
dest: /etc/init/lxc-net.override
|
|
||||||
owner: root
|
|
||||||
group: root
|
|
||||||
mode: 0644
|
|
||||||
tags:
|
|
||||||
- repo-build-apt-packages
|
|
||||||
|
|
||||||
- name: Install apt packages
|
|
||||||
apt:
|
|
||||||
pkg: "{{ item }}"
|
|
||||||
state: "{{ repo_build_package_state }}"
|
|
||||||
update_cache: yes
|
|
||||||
cache_valid_time: "{{ cache_timeout }}"
|
|
||||||
register: install_packages
|
|
||||||
until: install_packages|success
|
|
||||||
retries: 5
|
|
||||||
delay: 2
|
|
||||||
with_items: "{{ repo_build_distro_packages }}"
|
|
||||||
tags:
|
|
||||||
- repo-build-apt-packages
|
|
|
@ -1,26 +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 yum packages
|
|
||||||
yum:
|
|
||||||
pkg: "{{ item }}"
|
|
||||||
state: "{{ repo_build_package_state }}"
|
|
||||||
register: install_packages
|
|
||||||
until: install_packages | success
|
|
||||||
retries: 5
|
|
||||||
delay: 2
|
|
||||||
with_items: "{{ repo_build_distro_packages }}"
|
|
||||||
tags:
|
|
||||||
- repo-build-yum-packages
|
|
|
@ -13,14 +13,16 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
- include: install-apt.yml
|
- name: Install packages
|
||||||
static: no
|
package:
|
||||||
when: ansible_pkg_mgr == 'apt'
|
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:
|
tags:
|
||||||
- install-apt
|
- repo-build-apt-packages
|
||||||
|
- repo-build-yum-packages
|
||||||
- include: install-yum.yml
|
|
||||||
static: no
|
|
||||||
when: ansible_pkg_mgr == 'yum'
|
|
||||||
tags:
|
|
||||||
- install-yum
|
|
||||||
|
|
Loading…
Reference in New Issue