From fdb329ff39934b55fbfb9ef9a7087510c07d9bae Mon Sep 17 00:00:00 2001
From: Baptiste DE RENZO <baptiste.derenzo@ubicast.eu>
Date: Mon, 7 Feb 2022 10:03:16 +0000
Subject: [PATCH] Update to ansible 5.2, Refs #35175
---
playbooks/tests/firewall-rules.yml | 4 ++--
requirements.dev.txt | 4 +---
requirements.txt | 2 +-
roles/mediavault/tasks/main.yml | 2 +-
roles/postgres/defaults/main.yml | 1 +
roles/sysconfig/tasks/main.yml | 9 +++++----
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/playbooks/tests/firewall-rules.yml b/playbooks/tests/firewall-rules.yml
index 605ddf34..c0990505 100755
--- a/playbooks/tests/firewall-rules.yml
+++ b/playbooks/tests/firewall-rules.yml
@@ -18,7 +18,7 @@
- include_vars:
file: ressources/firewall/rules.yml
- - include: ressources/firewall/listen.yml
+ - include_tasks: ressources/firewall/listen.yml
# loop over listen vars (named outer_item) and call firewall-listen
loop: "{{ listen }}"
loop_control:
@@ -35,7 +35,7 @@
file: ressources/firewall/rules.yml
- name: test rules
- include: ressources/firewall/test-rule.yml
+ include_tasks: ressources/firewall/test-rule.yml
# loop over listen vars (named outer_item) and call firewall-listen
loop: "{{ test }}"
loop_control:
diff --git a/requirements.dev.txt b/requirements.dev.txt
index 959ef80a..b37ddd6d 100644
--- a/requirements.dev.txt
+++ b/requirements.dev.txt
@@ -1,7 +1,5 @@
ansible-lint
flake8
-#git+https://github.com/atmaniak/molecule@e03437923b302fca1bd7b4f6030c6956ad00367a#egg=molecule[docker]
-#git+https://github.com/ansible-community/molecule@bc795e717108af2f8e63bbb05fcc4d7212ef62cd#egg=molecule[docker]
-molecule[docker]==3.2.2
+molecule[docker]
pytest-testinfra
yamllint
diff --git a/requirements.txt b/requirements.txt
index 89d375f5..dfb6cb2f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-ansible<2.10
+ansible<5.3
netaddr
pyyaml
openstacksdk
diff --git a/roles/mediavault/tasks/main.yml b/roles/mediavault/tasks/main.yml
index cbeea8e8..ca03f5ed 100644
--- a/roles/mediavault/tasks/main.yml
+++ b/roles/mediavault/tasks/main.yml
@@ -15,7 +15,7 @@
ssh_key_file: .ssh/id_ed25519
# MAILER
-- include: mailer.yml
+- include_tasks: mailer.yml
# FIREWALL
- name: firewall
diff --git a/roles/postgres/defaults/main.yml b/roles/postgres/defaults/main.yml
index 9bf750b5..b1ef40b9 100644
--- a/roles/postgres/defaults/main.yml
+++ b/roles/postgres/defaults/main.yml
@@ -1,6 +1,7 @@
---
pg_packages:
+ - acl
- postgresql
pg_version: 11
diff --git a/roles/sysconfig/tasks/main.yml b/roles/sysconfig/tasks/main.yml
index 25646b1f..6f8ce721 100644
--- a/roles/sysconfig/tasks/main.yml
+++ b/roles/sysconfig/tasks/main.yml
@@ -1,5 +1,5 @@
---
-- include: repos.yml
+- include_tasks: repos.yml
# Upgrade already installed packages to latest version and clean system
@@ -11,6 +11,7 @@
register: apt_status
retries: 60
until: apt_status is success or ('Failed to lock apt for exclusive operation' not in apt_status.msg and '/var/lib/dpkg/lock' not in apt_status.msg)
+ changed_when: false
- name: apt dist upgrade
apt:
@@ -117,10 +118,10 @@
include_role:
name: ferm-configure
-- include: logs.yml
+- include_tasks: logs.yml
-- include: locale.yml
+- include_tasks: locale.yml
-- include: ntp.yml
+- include_tasks: ntp.yml
...
--
GitLab