From 8c04d49953aab60e49feb703d4c79ca09ba8d238 Mon Sep 17 00:00:00 2001
From: "Dave Wilde (d34dh0r53)" <cdwilde@gmail.com>
Date: Wed, 28 Oct 2020 15:05:09 -0500
Subject: [PATCH] Pin ansible to less than 2.10.0
The move to collection based community modules is currently not
compatable with the call to ipa_role. This pins the ansible version
to a working version.
Change-Id: Ie495f8110245d723180bd57a572687c0b22166b0
Closes-Bug: 1901547
Fix gpg error when installing container.io
This change fixes the following error while manually installing
container.io:
"Failed to validate GPG signature for containerd.io"
Change-Id: I7ea0e55044d63d08206adb29905403982c7b13f8
---
ansible-requirements.txt | 2 +-
molecule-requirements.txt | 2 +-
tripleo_ipa/roles/tripleo_ipa_setup/tasks/setup.yml | 2 +-
zuul.d/playbooks/pre.yml | 12 +++++++++---
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ansible-requirements.txt b/ansible-requirements.txt
index a89eb19..4676e4a 100644
--- a/ansible-requirements.txt
+++ b/ansible-requirements.txt
@@ -1 +1 @@
-ansible>=2.8
+ansible>=2.8, <2.10.0
diff --git a/molecule-requirements.txt b/molecule-requirements.txt
index 31b6292..ad1e363 100644
--- a/molecule-requirements.txt
+++ b/molecule-requirements.txt
@@ -1,4 +1,4 @@
-ansible
+ansible>=2.8, <2.10.0
docker
molecule>=3.0,<3.1
testinfra
diff --git a/tripleo_ipa/roles/tripleo_ipa_setup/tasks/setup.yml b/tripleo_ipa/roles/tripleo_ipa_setup/tasks/setup.yml
index 14187d6..345c654 100644
--- a/tripleo_ipa/roles/tripleo_ipa_setup/tasks/setup.yml
+++ b/tripleo_ipa/roles/tripleo_ipa_setup/tasks/setup.yml
@@ -50,7 +50,7 @@
- 'Retrieve Certificates from the CA'
# unfortunately we don't have ansible module yet to create perms
-- name: add nova host managedment permissions
+- name: add nova host management permissions
shell: |
ipa permission-find "{{ item.name }}"
if [ $? -ne 0 ]; then
diff --git a/zuul.d/playbooks/pre.yml b/zuul.d/playbooks/pre.yml
index 63e3d58..8741271 100644
--- a/zuul.d/playbooks/pre.yml
+++ b/zuul.d/playbooks/pre.yml
@@ -34,10 +34,16 @@
# NOTE(cloudnull): This is being done because docker is not supported on RHEL-8
# and tests within this repo still require docker.
- - name: Manually install containerd.io
+ - name: Install gpg/container.io rpm
become: true
- package:
- name: https://download.docker.com/linux/centos/7/x86_64/stable/Packages/containerd.io-1.2.6-3.3.el7.x86_64.rpm
+ block:
+ - name: Import GPG key from docker.com
+ rpm_key:
+ state: present
+ key: https://download.docker.com/linux/centos/gpg
+ - name: Manually install containerd.io
+ package:
+ name: https://download.docker.com/linux/centos/7/x86_64/stable/Packages/containerd.io-1.2.6-3.3.el7.x86_64.rpm
when:
- (ansible_distribution_major_version | int) >= 8
roles: