From b6370fc22b57de833a03bd01fc291c2422732851 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Wed, 9 Dec 2015 15:53:32 +0100 Subject: [PATCH] library/roles/R/tasks/main.yml: Put packages on hold when we choose to install specific ones. d4science-ghn-cluster/group_vars/dataminer_dev: Use dataminer release 1.0.0-3.9.0 and not the snapshot d4science-ghn-cluster/roles/dataminer_app/templates/pom.xml.j2: Fix the pom to download the correct dependencies. --- R/defaults/main.yml | 3 +++ R/tasks/main.yml | 7 +++++++ ubuntu-deb-general/tasks/manage_su_limits.yml | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/R/defaults/main.yml b/R/defaults/main.yml index f016fe69..51703b41 100644 --- a/R/defaults/main.yml +++ b/R/defaults/main.yml @@ -36,6 +36,9 @@ r_source_plugins_dest_dir: /var/cache/R r_base_packages_list: - r-base +# Same list as above, but without version numbers. +#r_base_packages_hold_list: + r_plugins_packages_list: - jags - r-cran-rjags diff --git a/R/tasks/main.yml b/R/tasks/main.yml index d86a7258..d76005e1 100644 --- a/R/tasks/main.yml +++ b/R/tasks/main.yml @@ -12,6 +12,13 @@ with_items: r_base_packages_list tags: [ 'r_software', 'r_pkg' ] +- name: When we install specific R deb packages, put them on hold + shell: apt-mark hold {{ item }} + with_items: r_base_packages_hold_list + when: r_base_specific_version + ignore_errors: True + tags: [ 'r_software', 'r_pkg', 'r_pkg_hold' ] + - name: Install the R additional modules from the deb repo apt: pkg={{ item }} state={{ r_packages_state }} with_items: r_plugins_packages_list diff --git a/ubuntu-deb-general/tasks/manage_su_limits.yml b/ubuntu-deb-general/tasks/manage_su_limits.yml index bd2d774d..e3b71b92 100644 --- a/ubuntu-deb-general/tasks/manage_su_limits.yml +++ b/ubuntu-deb-general/tasks/manage_su_limits.yml @@ -1,4 +1,4 @@ --- -- name: Fix debian/ubuntu broke behaviour. The su pam config does not load pam_limits +- name: Fix debian/ubuntu broken behaviour. The su pam config does not load pam_limits lineinfile: dest=/etc/pam.d/su line="session required pam_limits.so" insertafter="^#\ \(Replaces\ the\ use\ of\ /etc/limits.*$" tags: [ 'su', 'pam_limits']