From 6e00f579c4c410502c8c1133ae52eaac1d623f44 Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin.carter@rackspace.com>
Date: Mon, 9 Jul 2018 20:13:13 -0500
Subject: [PATCH] Update ansible to latest stable 2.6.x

With this, the requirement for the os_* modules
changes from shade to openstacksdk. The 'ansible-next'
job is also updated to test stable-2.7.

Depends-On: https://review.openstack.org/#/c/611765
Change-Id: If32f88592caa849c3c7c9701d4803530d9e549ed
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
---
 requirements.txt             | 2 +-
 scripts/bootstrap-ansible.sh | 2 +-
 zuul.d/jobs.yaml             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 0787567de2..3064f47811 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,7 +23,7 @@ python-openstackclient>=3.14.2
 
 # We use this for the Ansible openstack
 # modules.
-shade>=1.17.0 # Apache-2.0
+openstacksdk>=0.14.0 # Apache-2.0
 
 # We use this for the json_query filter
 jmespath>=0.9.3 # MIT
diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
index fcdf6062b0..4c9ca30914 100755
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@@ -22,7 +22,7 @@ set -e -u -x
 export HTTP_PROXY=${HTTP_PROXY:-""}
 export HTTPS_PROXY=${HTTPS_PROXY:-""}
 # The Ansible version used for testing
-export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible==2.5.8"}
+export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible==2.6.6"}
 export ANSIBLE_ROLE_FILE=${ANSIBLE_ROLE_FILE:-"ansible-role-requirements.yml"}
 export SSH_DIR=${SSH_DIR:-"/root/.ssh"}
 export DEBIAN_FRONTEND=${DEBIAN_FRONTEND:-"noninteractive"}
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index b32d32c2fd..1b32519dfa 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -67,7 +67,7 @@
     branches: ^(devel|master)$
     required-projects:
       - name: github.com/ansible/ansible
-        override-checkout: stable-2.6
+        override-checkout: stable-2.7
     vars:
       ansible_package: "file://{{ ansible_user_dir }}/src/github.com/ansible/ansible"