Merge "Remove ansible<2.2 apt cache hack"
This commit is contained in:
commit
5e2ad01ed8
@ -13,23 +13,12 @@
|
|||||||
# 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.
|
||||||
|
|
||||||
#TODO(evrardjp): Replace the next 2 tasks by a standard apt with cache
|
|
||||||
#when https://github.com/ansible/ansible-modules-core/pull/1517 is merged
|
|
||||||
#in 1.9.x or we move to 2.0 (if tested working)
|
|
||||||
- name: Check apt last update file
|
|
||||||
stat:
|
|
||||||
path: /var/cache/apt
|
|
||||||
register: apt_cache_stat
|
|
||||||
|
|
||||||
- name: Update apt if needed
|
|
||||||
apt:
|
|
||||||
update_cache: yes
|
|
||||||
when: "ansible_date_time.epoch|float - apt_cache_stat.stat.mtime > {{cache_timeout}}"
|
|
||||||
|
|
||||||
- name: Install apt packages
|
- name: Install apt packages
|
||||||
apt:
|
apt:
|
||||||
pkg: "{{ item }}"
|
pkg: "{{ item }}"
|
||||||
state: "{{ swift_package_state }}"
|
state: "{{ swift_package_state }}"
|
||||||
|
update_cache: yes
|
||||||
|
cache_valid_time: "{{ cache_timeout }}"
|
||||||
register: install_packages
|
register: install_packages
|
||||||
until: install_packages|success
|
until: install_packages|success
|
||||||
retries: 5
|
retries: 5
|
||||||
|
Loading…
Reference in New Issue
Block a user