Merge branch 'master' of gitorious.research-infrastructures.eu:infrastructure-management/ansible-playbooks

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

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

ubuntu-deb-general/defaults/main.yml

@@ -10,6 +10,7 @@ common_packages:
   - zile
   - dstat
   - iotop
+  - curl
   - wget
   - vim-tiny
   - psmisc