Merge pull request #508 from ariddell/feature/ansible-lint

Update ansible in jessie

.travis.yml

@@ -1,7 +1,8 @@
 language: python
 python: "2.7"
 install:
-  - pip install ansible ansible-lint
+  - pip install -r requirements.txt
+  - pip install -r test-requirements.txt
 script:
   - ansible-playbook --syntax-check -i hosts site.yml
   - ansible-lint site.yml

requirements.txt

@@ -1,2 +1 @@
-ansible==1.9.3
-nose
+ansible>=1.9.3,<2

roles/common/tasks/google_auth.yml

@@ -26,8 +26,8 @@
 - name: Generate a timed-based, no reuse, rate-limited (3 logins per 30 seconds) with one concurrently valid code for default user
   command: /usr/bin/google-authenticator -t -f -d --label="{{ main_user_name }}@{{ domain }}" --qr-mode=ANSI -r 3 -R 30 -w 1 --secret=/home/{{ main_user_name }}/.google_authenticator
            creates=/home/{{ main_user_name }}/.google_authenticator
-  sudo: yes
-  sudo_user: "{{ main_user_name }}"
+  become: yes
+  become_user: "{{ main_user_name }}"
   when: ansible_ssh_user != "vagrant"
 
 - name: Retrieve generated keys from server

site.yml

@@ -3,7 +3,7 @@
 
 - hosts: all
   user: deploy
-  sudo: True
+  become: True
   gather_facts: True
   vars_files:
     - vars/defaults.yml

test-requirements.txt

@@ -0,0 +1 @@
+ansible-lint>=2.3.9,<3