From cd1753d85a58b720976a1444fc44230b3fdd4c53 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 12 May 2020 13:03:10 +0100
Subject: [PATCH] Fix multiple CI failures
1. Blacklist Ansible 2.9.8
Ansible 2.9.8 includes a regression on the fileglob plugin [1] that
causes the Kolla Ansible HAProxy role to fail.
This change blacklists Ansible 2.9.8 to work around the issue.
2. Use ensure-docker role instead of install-docker
The install-* roles are being deprecated and renamed to follow the
ensure-* naming convention [2].
[1] https://github.com/ansible/ansible/issues/69450
[2] http://lists.zuul-ci.org/pipermail/zuul-announce/2020-April/000071.html
Change-Id: Iab1d84e6a8c1b3dd81e53279309153687677a061
Story: 2007659
Task: 39748
---
ansible/roles/kolla-ansible/tasks/install.yml | 2 +-
playbooks/kayobe-tox-molecule/pre.yml | 2 +-
.../notes/blacklist-ansible-2.9.8-f83ad748b01a575b.yaml | 7 +++++++
requirements.txt | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
create mode 100644 releasenotes/notes/blacklist-ansible-2.9.8-f83ad748b01a575b.yaml
diff --git a/ansible/roles/kolla-ansible/tasks/install.yml b/ansible/roles/kolla-ansible/tasks/install.yml
index 64b225f4..b02733d4 100644
--- a/ansible/roles/kolla-ansible/tasks/install.yml
+++ b/ansible/roles/kolla-ansible/tasks/install.yml
@@ -82,7 +82,7 @@
# 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.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 %}
selinux
diff --git a/playbooks/kayobe-tox-molecule/pre.yml b/playbooks/kayobe-tox-molecule/pre.yml
index 058cd017..126baa2c 100644
--- a/playbooks/kayobe-tox-molecule/pre.yml
+++ b/playbooks/kayobe-tox-molecule/pre.yml
@@ -1,4 +1,4 @@
---
- hosts: all
roles:
- - role: install-docker
+ - role: ensure-docker
diff --git a/releasenotes/notes/blacklist-ansible-2.9.8-f83ad748b01a575b.yaml b/releasenotes/notes/blacklist-ansible-2.9.8-f83ad748b01a575b.yaml
new file mode 100644
index 00000000..657d9ef1
--- /dev/null
+++ b/releasenotes/notes/blacklist-ansible-2.9.8-f83ad748b01a575b.yaml
@@ -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>`__.
diff --git a/requirements.txt b/requirements.txt
index d400ad30..6e2d373d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
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
netaddr!=0.7.16,>=0.7.13 # BSD
PyYAML>=3.10.0 # MIT
--
GitLab