Merge pull request #4764 from sdodson/ansible-2-3

Merged by openshift-bot

requirements.txt

@@ -1,6 +1,6 @@
 # Versions are pinned to prevent pypi releases arbitrarily breaking
 # tests with new APIs/semantics. We want to update versions deliberately.
-ansible==2.2.2.0
+ansible==2.3.1.0
 boto==2.34.0
 click==6.7
 pyOpenSSL==16.2.0

tox.ini

@@ -24,9 +24,4 @@ commands =
     generate_validation: python setup.py generate_validation
     # TODO(rhcarvalho): check syntax of other important entrypoint playbooks
     ansible_syntax: python setup.py ansible_syntax
-    # ansible 2.2.2+ unfortunately breaks the integration test runner
-    # because it can no longer set facts on the test docker hosts.
-    # So for now, install separate ansible version for integration.
-    # PR that fixes it: https://github.com/ansible/ansible/pull/23599
-    # Once that PR is available, drop this and use same ansible.
-    integration: pip install ansible==2.2.1.0
+    integration: python -c 'print "run test/integration/run-tests.sh"'