Merge branch 'master' of /home/nimrod/Documents/Shore/Ansible/example

# Conflicts:
#	molecule.yml
#	tests/playbook.yml

.travis.yml

@@ -9,7 +9,6 @@ cache:
   - pip
   - directories:
       - $HOME/.pre-commit
-      - $HOME/virtualenv
 
 install:
   - pip install -r tests/requirements.txt | cat

molecule.yml

@@ -41,18 +41,22 @@ docker:
     image_version: xenial
     environment:
         DEBIAN_FRONTEND: noninteractive
+        container: docker
   - name: python27-trusty
     image: ubuntu
     image_version: trusty
     environment:
         DEBIAN_FRONTEND: noninteractive
+        container: docker
   - name: python27-jessie
     image: debian
     image_version: jessie
     environment:
         DEBIAN_FRONTEND: noninteractive
+        container: docker
   - name: python27-stretch
     image: debian
     image_version: stretch
     environment:
         DEBIAN_FRONTEND: noninteractive
+        container: docker

tests/requirements.txt

 ansible==2.2.0.0
-testinfra==1.4.4
-molecule==1.15.0
-ansible-lint==3.4.4
-pre-commit==0.9.3
+testinfra==1.4.5
+molecule==1.16.1
+ansible-lint==3.4.7
+pre-commit==0.9.4
 piprot==0.9.7
 python-vagrant==0.5.14
 docker-py==1.10.6