diff --git a/R/tasks/main.yml b/R/tasks/main.yml index d76005e1..b8fb9e99 100644 --- a/R/tasks/main.yml +++ b/R/tasks/main.yml @@ -43,6 +43,17 @@ tags: [ 'r_software', 'r_pkg', 'r_plugins', 'r_plugins_version' ] - name: Install R packages from the cran sources, specific versions + command: > + Rscript --slave --no-save --no-restore-history -e "if (! ('{{ item.name }}' %in% installed.packages()[,'Package'])) { install.packages('{{ r_source_plugins_dest_dir }}/{{ item.source }}', repos = NULL, type='source'); print('Added'); } else if (packageVersion('{{ item.name }}') != '{{ item.version }}') { install.packages('{{ r_source_plugins_dest_dir }}/{{ item.source }}', repos = NULL, type='source'); print('Added'); } else { print('Already Installed'); }" + register: install_s_plugins_result + failed_when: "install_s_plugins_result.rc != 0 or 'had non-zero exit status' in install_s_plugins_result.stderr" + changed_when: '"Added" in install_s_plugins_result.stdout' + with_items: r_plugins_from_sources + when: r_plugins_install_specific_source + ignore_errors: True + tags: [ 'r_software', 'r_pkg', 'r_plugins', 'r_plugins_version' ] + +- name: Install R packages from the cran sources, specific versions. Second round, to avoid circular dependencies command: > Rscript --slave --no-save --no-restore-history -e "if (! ('{{ item.name }}' %in% installed.packages()[,'Package'])) { install.packages('{{ r_source_plugins_dest_dir }}/{{ item.source }}', repos = NULL, type='source'); print('Added'); } else if (packageVersion('{{ item.name }}') != '{{ item.version }}') { install.packages('{{ r_source_plugins_dest_dir }}/{{ item.source }}', repos = NULL, type='source'); print('Added'); } else { print('Already Installed'); }" register: install_s_plugins_result diff --git a/haproxy/tasks/main.yml b/haproxy/tasks/main.yml index 10650d20..ba53d9b9 100644 --- a/haproxy/tasks/main.yml +++ b/haproxy/tasks/main.yml @@ -31,7 +31,7 @@ tags: haproxy - name: Ensure that haproxy is enabled and started - service: name=haproxy state=started enabled=yes + service: name=haproxy state=restarted enabled=yes when: haproxy_enabled ignore_errors: True tags: haproxy diff --git a/ubuntu-deb-general/defaults/main.yml b/ubuntu-deb-general/defaults/main.yml index 986f2f58..bce118aa 100644 --- a/ubuntu-deb-general/defaults/main.yml +++ b/ubuntu-deb-general/defaults/main.yml @@ -10,6 +10,7 @@ common_packages: - zile - dstat - iotop + - curl - wget - vim-tiny - psmisc