openstack
/
kayobe
Code Issues Proposed changes

Merge "Bump Ansible to 2.6.x"

This commit is contained in:
Zuul 2018-11-29 00:31:14 +00:00 committed by Gerrit Code Review
parent c3ec38632e a0b4ab57a4
commit e103d455ee
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/kolla-ansible/templates/requirements.txt.j2
View File

@ -7,7 +7,7 @@ kolla-ansible=={{ kolla_openstack_release }}
{% endif %}
# Limit the version of ansible used by kolla-ansible to avoid new releases from
# breaking tested code. Changes to this limit should be tested.
ansible<2.6
ansible<2.7
{% if kolla_ansible_venv_extra_requirements is defined %}
{% for item in kolla_ansible_venv_extra_requirements %}
{{ item }}

2
requirements.txt
View File

@ -7,7 +7,7 @@ pbr>=2.0 # Apache-2.0
# with the fix backported. It can be installed by uncommenting the following
# line and commenting the one after.
# -e git+https://github.com/stackhpc/ansible@issue-30350-2.3#egg=ansible-issue-30350-2.3 # GPLv3
ansible>=2.4.0,<2.6.0 # GPLv3
ansible>=2.4.0,<2.7.0 # GPLv3
cliff>=2.5.0 # Apache
netaddr!=0.7.16,>=0.7.13 # BSD
PyYAML>=3.10.0 # MIT