summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2018-08-13 17:48:51 -0400
committerDavid Moreau Simard <dmsimard@redhat.com>2018-08-30 19:05:16 +0000
commit87b3df316938d346feed6186465e6862c0a377eb (patch)
tree0bda5a09b80f4639926685bc9839387da7835cf7
parent20743b5f13df5a4338e1f01378a0330dd19fa3c8 (diff)
Bump ansible to latest 2.5 version
This is the same version run by zuul. Update devstack callback for ansible 2.5. Change-Id: Ic0d2559346570e60025838166b9bd0081eee331a Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Notes
Notes (review): Code-Review+2: James E. Blair <corvus@inaugust.com> Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Code-Review-1: Sorin Sbarnea <ssbarnea@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 31 Aug 2018 04:36:37 +0000 Reviewed-on: https://review.openstack.org/591527 Project: openstack-infra/devstack-gate Branch: refs/heads/master
-rwxr-xr-xdevstack-vm-gate-wrap.sh2
-rw-r--r--playbooks/plugins/callback/devstack.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index a6fdc8f..2cecd5f 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -28,7 +28,7 @@ GIT_BRANCH=${GIT_BRANCH:-master}
28# We're using enough ansible specific features that it's extremely 28# We're using enough ansible specific features that it's extremely
29# possible that new ansible releases can break us. As such we should 29# possible that new ansible releases can break us. As such we should
30# be very deliberate about which ansible we use. 30# be very deliberate about which ansible we use.
31ANSIBLE_VERSION=${ANSIBLE_VERSION:-2.3.2.0} 31ANSIBLE_VERSION=${ANSIBLE_VERSION:-2.5.7}
32export DSTOOLS_VERSION=${DSTOOLS_VERSION:-0.4.0} 32export DSTOOLS_VERSION=${DSTOOLS_VERSION:-0.4.0}
33 33
34# sshd may have been compiled with a default path excluding */sbin 34# 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 0433ada..1f0a661 100644
--- a/playbooks/plugins/callback/devstack.py
+++ b/playbooks/plugins/callback/devstack.py
@@ -22,7 +22,7 @@ from __future__ import print_function
22 22
23from ansible import constants as C 23from ansible import constants as C
24from ansible.plugins.callback import CallbackBase 24from ansible.plugins.callback import CallbackBase
25from ansible.vars import strip_internal_keys 25from ansible.plugins.callback import strip_internal_keys
26 26
27import datetime 27import datetime
28import yaml 28import yaml