Merge "Update ansible to latest stable 2.6.x"

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

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"}

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"