Merge "Ansible 2.1.1 role testing"

2016-08-17 04:56:50 +00:00 · 2016-08-17 04:56:50 +00:00 · 9b3a6e2536
commit 9b3a6e2536
parent 728313e914 b8860f2026
2 changed files with 2 additions and 2 deletions
--- a/meta/main.yml
+++ b/meta/main.yml
@ -36,4 +36,4 @@ dependencies:
  - role: apt_package_pinning
    when:
      - ansible_pkg_mgr == 'apt'
-  - pip_install
+  - role: pip_install
--- a/tox.ini
+++ b/tox.ini
@ -103,7 +103,7 @@ commands =
 [testenv:ansible]
 deps =
    {[testenv]deps}
-    ansible==1.9.4
+    ansible==2.1.1
    ansible-lint>=2.7.0,<3.0.0
 setenv =
    {[testenv]setenv}