From 39133e2127394cddc444cc477791cba7e8cdc5c7 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 21 Dec 2015 18:23:08 +0100 Subject: [PATCH] d4science-ghn-cluster/group_vars/egi_smartexecutor: explicitly list the R packages to be installed. d4science-ghn-cluster/group_vars/mongo_cluster_prod/iptables.yml: Add the last cloud provider's networks. d4science-ghn-cluster/host_vars: Remove the old host_vars definitions. d4science-ghn-cluster/group_vars/smartexecutor_prod/r-packages.yml: explicitly list the R packages to be installed. d4science-ghn-cluster/inventory/hosts.production: Merge the smartexecutor_prod groups. --- R/defaults/main.yml | 3 ++- R/tasks/main.yml | 15 +++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/R/defaults/main.yml b/R/defaults/main.yml index 51703b41..9e37be2e 100644 --- a/R/defaults/main.yml +++ b/R/defaults/main.yml @@ -14,7 +14,8 @@ r_install_cran_repo: absent r_cran_mirror_site: http://cran.mirror.garr.it/mirrors/CRAN/ r_base_specific_version: False r_base_pkg_version: 2.14.1 -r_packages_state: present +r_packages_main_state: present +r_packages_state: '{{ r_packages_main_state }}' r_needs_additional_distro_pkgs: False r_plugins_from_deb: True r_plugins_install_latest_source: True diff --git a/R/tasks/main.yml b/R/tasks/main.yml index b8fb9e99..6dd47304 100644 --- a/R/tasks/main.yml +++ b/R/tasks/main.yml @@ -7,8 +7,15 @@ apt_repository: repo='deb http://cran.rstudio.com/bin/linux/ubuntu {{ ansible_distribution_release }}/' state={{ r_install_cran_repo }} update_cache=yes tags: [ 'r_software', 'r_repo' ] -- name: Install a specific version of the R base package - apt: pkg={{ item }} state={{ r_packages_state }} +- name: Remove the hold state from the debian R packages + shell: apt-mark unhold {{ item }} + with_items: r_base_packages_hold_list + when: r_base_packages_hold_list is defined + ignore_errors: True + tags: [ 'r_software', 'r_pkg', 'r_pkg_hold' ] + +- name: Install the R base packages. + apt: pkg={{ item }} state={{ r_packages_main_state }} force=yes with_items: r_base_packages_list tags: [ 'r_software', 'r_pkg' ] @@ -20,13 +27,13 @@ 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 }} + apt: pkg={{ item }} state={{ r_packages_state }} force=yes with_items: r_plugins_packages_list when: r_plugins_from_deb tags: [ 'r_software', 'r_pkg' ] - name: Install some packages needed by R plugins when installed from source, if needed - apt: pkg={{ item }} state={{ r_packages_state }} update_cache=yes + apt: pkg={{ item }} state={{ r_packages_state }} update_cache=yes force=yes with_items: r_distribution_required_packages when: r_needs_additional_distro_pkgs tags: [ 'r_software', 'r_pkg' ]