openstack/openstack-ansible
Code Issues Proposed changes

Update ansible to latest stable 2.6.x

Browse Source 
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>
This commit is contained in:
Kevin Carter 2018-07-09 20:13:13 -05:00 committed by Jimmy McCrory
parent 2ba27102a5
commit 6e00f579c4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -23,7 +23,7 @@ python-openstackclient>=3.14.2
# We use this for the Ansible openstack # We use this for the Ansible openstack
# modules. # modules.
shade>=1.17.0 # Apache-2.0 openstacksdk>=0.14.0 # Apache-2.0
# We use this for the json_query filter # We use this for the json_query filter
jmespath>=0.9.3 # MIT jmespath>=0.9.3 # MIT

2
scripts/bootstrap-ansible.sh
View File

@ -22,7 +22,7 @@ set -e -u -x
export HTTP_PROXY=${HTTP_PROXY:-""} export HTTP_PROXY=${HTTP_PROXY:-""}
export HTTPS_PROXY=${HTTPS_PROXY:-""} export HTTPS_PROXY=${HTTPS_PROXY:-""}
# The Ansible version used for testing # 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 ANSIBLE_ROLE_FILE=${ANSIBLE_ROLE_FILE:-"ansible-role-requirements.yml"}
export SSH_DIR=${SSH_DIR:-"/root/.ssh"} export SSH_DIR=${SSH_DIR:-"/root/.ssh"}
export DEBIAN_FRONTEND=${DEBIAN_FRONTEND:-"noninteractive"} export DEBIAN_FRONTEND=${DEBIAN_FRONTEND:-"noninteractive"}

2
zuul.d/jobs.yaml
View File

@ -67,7 +67,7 @@
branches: ^(devel|master)$ branches: ^(devel|master)$
required-projects: required-projects:
- name: github.com/ansible/ansible - name: github.com/ansible/ansible
override-checkout: stable-2.6 override-checkout: stable-2.7
vars: vars:
ansible_package: "file://{{ ansible_user_dir }}/src/github.com/ansible/ansible" ansible_package: "file://{{ ansible_user_dir }}/src/github.com/ansible/ansible"