Merge "Fix multiple CI failures"

This commit is contained in:
Zuul 2020-05-13 10:49:23 +00:00 committed by Gerrit Code Review
commit 840c56167a
4 changed files with 10 additions and 3 deletions

View File

@ -82,7 +82,7 @@
# Limit the version of ansible used by kolla-ansible to avoid new # Limit the version of ansible used by kolla-ansible to avoid new
# releases from breaking tested code. Changes to this limit should be # releases from breaking tested code. Changes to this limit should be
# tested. # tested.
- ansible>=2.8,<2.10,!=2.8.9 - ansible>=2.8,<2.10,!=2.8.9,!=2.9.8
- >- - >-
{%- if ansible_os_family == 'RedHat' and ansible_distribution_major_version | int >= 8 %} {%- if ansible_os_family == 'RedHat' and ansible_distribution_major_version | int >= 8 %}
selinux selinux

View File

@ -1,4 +1,4 @@
--- ---
- hosts: all - hosts: all
roles: roles:
- role: install-docker - role: ensure-docker

View File

@ -0,0 +1,7 @@
---
fixes:
- |
Blacklists Ansible 2.9.8 to avoid an `issue
<https://github.com/ansible/ansible/issues/69450>`__ with the Ansible
``fileglob`` plugin. See `story 2007659
<https://storyboard.openstack.org/#!/story/2007659>`__.

View File

@ -1,5 +1,5 @@
pbr>=2.0 # Apache-2.0 pbr>=2.0 # Apache-2.0
ansible>=2.8.0,<2.10.0,!=2.8.9 # GPLv3 ansible>=2.8.0,<2.10.0,!=2.8.9,!=2.9.8 # GPLv3
cliff>=3.1.0 # Apache cliff>=3.1.0 # Apache
netaddr!=0.7.16,>=0.7.13 # BSD netaddr!=0.7.16,>=0.7.13 # BSD
PyYAML>=3.10.0 # MIT PyYAML>=3.10.0 # MIT