tpiccioli
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The infrascience ppa repository is now optional and disabled by default.

This commit is contained in:
Andrea Dell'Amico 2017-07-21 11:08:34 +02:00
parent 47788be177
commit ab3d32a54d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ubuntu-deb-general/defaults/main.yml
View File

@ -121,6 +121,9 @@ default_security_limits:
# - ':msg, contains, "icmp6_send: no reply to icmp error" ~' # - ':msg, contains, "icmp6_send: no reply to icmp error" ~'
# - ':msg, contains, "[PYTHON] Can\'t call the metric handler function for" ~' # - ':msg, contains, "[PYTHON] Can\'t call the metric handler function for" ~'
#
infrascience_internal_ppa: False
# #
# debian/ubuntu distributions controllers # debian/ubuntu distributions controllers
# #

9
ubuntu-deb-general/tasks/packages.yml
View File

@ -47,6 +47,7 @@
when: when:
- is_ubuntu - is_ubuntu
- egi_image is not defined or not egi_image - egi_image is not defined or not egi_image
- infrascience_internal_ppa
ignore_errors: True ignore_errors: True
tags: packages tags: packages
@ -58,7 +59,9 @@
- name: setup system apt repository - name: setup system apt repository
apt_repository: repo='deb [arch=amd64] http://ppa.research-infrastructures.eu/system stable main' update_cache=yes apt_repository: repo='deb [arch=amd64] http://ppa.research-infrastructures.eu/system stable main' update_cache=yes
when: is_ubuntu when:
- is_ubuntu
- infrascience_internal_ppa
ignore_errors: True ignore_errors: True
tags: packages tags: packages
@ -70,7 +73,9 @@
- name: setup system apt repository for specific distributions - name: setup system apt repository for specific distributions
apt_repository: repo='deb [arch=amd64] http://ppa.research-infrastructures.eu/system {{ ansible_distribution_release }} main' update_cache=yes apt_repository: repo='deb [arch=amd64] http://ppa.research-infrastructures.eu/system {{ ansible_distribution_release }} main' update_cache=yes
when: is_trusty when:
- is_trusty
- infrascience_internal_ppa
ignore_errors: True ignore_errors: True
tags: packages tags: packages