diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index a6fdc8fa..2cecd5fa 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -28,7 +28,7 @@ GIT_BRANCH=${GIT_BRANCH:-master} # We're using enough ansible specific features that it's extremely # possible that new ansible releases can break us. As such we should # be very deliberate about which ansible we use. -ANSIBLE_VERSION=${ANSIBLE_VERSION:-2.3.2.0} +ANSIBLE_VERSION=${ANSIBLE_VERSION:-2.5.7} export DSTOOLS_VERSION=${DSTOOLS_VERSION:-0.4.0} # sshd may have been compiled with a default path excluding */sbin diff --git a/playbooks/plugins/callback/devstack.py b/playbooks/plugins/callback/devstack.py index 0433ada6..1f0a6615 100644 --- a/playbooks/plugins/callback/devstack.py +++ b/playbooks/plugins/callback/devstack.py @@ -22,7 +22,7 @@ from __future__ import print_function from ansible import constants as C from ansible.plugins.callback import CallbackBase -from ansible.vars import strip_internal_keys +from ansible.plugins.callback import strip_internal_keys import datetime import yaml