Consistency changes

.travis.yml

@@ -41,9 +41,6 @@ install:
   # Install Ansible.
   - if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install ansible; else pip install ansible==$ANSIBLE_VERSION; fi
 
-  # Add ansible.cfg to pick up roles path.
-  - printf "[defaults]\nroles_path = ../" > ansible.cfg
-
 script:
   # Check the role/playbook's syntax.
   - ansible-playbook -i tests/inventory tests/test.yml --syntax-check

Vagrantfile

@@ -3,8 +3,6 @@
 
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
-File.open(File.dirname(__FILE__) + '/ansible.cfg', 'w') { |f| f.write("[defaults]\nroles_path = ../") }
-
 boxes = [
   {
     :name => "ubuntu-1204",

tasks/install.yml

@@ -1,18 +1,20 @@
 # tasks file for r
 ---
-- name: install dependencies
+- name: install | dependencies
   apt:
     name: "{{ item }}"
     state: latest
     update_cache: true
     cache_valid_time: 3600
   with_items: r_dependencies
   when: "item | trim != ''"
-  tags: [configuration, r, r-dependencies]
+  tags:
+    - r-install-dependencies
 
-- name: install
+- name: install | additional
   apt:
     name: "{{ item }}"
     state: latest
   with_items: r_install
-  tags: [configuration, r, r-install]
+  tags:
+    - r-install-additional

tasks/main.yml

@@ -1,4 +1,13 @@
 # tasks file for r
 ---
 - include: repository.yml
+  tags:
+    - configuration
+    - r
+    - r-repository
+
 - include: install.yml
+  tags:
+    - configuration
+    - r
+    - r-install

tasks/repository.yml

@@ -1,16 +1,18 @@
 # tasks file for r
 ---
-- name: add public key
+- name: repository | add public key
   apt_key:
     id: E084DAB9
     keyserver: keyserver.ubuntu.com
     state: present
-  tags: [configuration, r, r-public-key]
+  tags:
+    - r-repository-public-key
 
-- name: add cran-r repository
+- name: repository | add cran-r
   apt_repository:
     repo: "{{ item.type }} {{ item.url }}"
     state: present
     update_cache: yes
   with_items: r_repository
-  tags: [configuration, r, r-repository]
+  tags:
+    - r-repository-add

tests/test.yml

@@ -3,7 +3,7 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - ansible-r
+    - ../../
   vars:
     r_install:
       - littler

tests/vagrant.yml

@@ -4,4 +4,4 @@
   remote_user: vagrant
   sudo: true
   roles:
-    - r
+    - ../../