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"