diff --git a/roles/cni_plugins/defaults/main.yml b/roles/cni_plugins/defaults/main.yml index de13297..fe1fa5a 100644 --- a/roles/cni_plugins/defaults/main.yml +++ b/roles/cni_plugins/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version of the CNI plugins to install -cni_version: 1.6.1 +cni_version: 1.6.2 # Archive where the pre compiled bin archive will be downloaded cni_archive_url: https://github.com/containernetworking/plugins/releases/download/v{{ cni_version }}/cni-plugins-linux-amd64-v{{ cni_version }}.tgz # Expected checksum of the archive -cni_archive_sha256: 2503ce29ac445715ebe146073f45468153f9e28f45fa173cb060cfd9e735f563 +cni_archive_sha256: b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090 # Where the plugins will be installed (binaries will be extracted in a /bin sub-directory) cni_root_dir: /opt/cni diff --git a/roles/repo_base/tasks/epel_RedHat-8.yml b/roles/repo_base/tasks/epel_RedHat-8.yml index 07eff8f..b8d2c76 100644 --- a/roles/repo_base/tasks/epel_RedHat-8.yml +++ b/roles/repo_base/tasks/epel_RedHat-8.yml @@ -7,7 +7,7 @@ baseurl: https://mirror.in2p3.fr/pub/epel/$releasever/Everything/$basearch http://mirrors.ircam.fr/pub/fedora/epel/$releasever/Everything/$basearch http://mir01.syntis.net/epel/$releasever/Everything/$basearch https://fr2.rpmfind.net/linux/epel/$releasever/Everything/$basearch gpgcheck: True gpgkey: https://mir01.syntis.net/epel/RPM-GPG-KEY-EPEL-8 - exclude: dehydrated + exclude: dehydrated,zabbix* tags: repo - name: Config EPEL Modular repository diff --git a/roles/repo_base/tasks/epel_RedHat-9.yml b/roles/repo_base/tasks/epel_RedHat-9.yml index deda01b..dcb873a 100644 --- a/roles/repo_base/tasks/epel_RedHat-9.yml +++ b/roles/repo_base/tasks/epel_RedHat-9.yml @@ -7,6 +7,6 @@ baseurl: https://fr2.rpmfind.net/linux/epel/$releasever/Everything/$basearch https://mirror.in2p3.fr/pub/epel/$releasever/Everything/$basearch gpgcheck: True gpgkey: https://mirror.in2p3.fr/pub/epel/RPM-GPG-KEY-EPEL-9 - exclude: dehydrated + exclude: dehydrated,zabbix* tags: repo diff --git a/roles/repo_zabbix/tasks/Debian.yml b/roles/repo_zabbix/tasks/Debian.yml index 8b0a143..ad2b996 100644 --- a/roles/repo_zabbix/tasks/Debian.yml +++ b/roles/repo_zabbix/tasks/Debian.yml @@ -20,7 +20,7 @@ - name: Add Zabbix repo apt_repository: - repo: deb https://repo.zabbix.com/zabbix/{{ zabbix_major_version }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main + repo: deb https://repo.zabbix.com/zabbix/{{ zabbix_major_version }}{% if zabbix_major_version is version('7.2', '>=') %}/stable{% endif %}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main filename: zabbix tags: repo,zabbix diff --git a/roles/vault_bin/defaults/main.yml b/roles/vault_bin/defaults/main.yml index d2cc7a8..d343d6d 100644 --- a/roles/vault_bin/defaults/main.yml +++ b/roles/vault_bin/defaults/main.yml @@ -1,7 +1,7 @@ # Version of Vault to install -vault_version: 1.18.3 +vault_version: 1.18.4 # URL of the archive vault_archive_url: https://releases.hashicorp.com/vault/{{ vault_version }}/vault_{{ vault_version }}_linux_amd64.zip # Expected sha256 of the archive -vault_archive_sha256: 405ec904a45c2261e2c091640fb805bf5904fd2fe8a991ebc58d2eb64f9a269e +vault_archive_sha256: bdde42660c14700e4d5275760d50c59ed637803cd9c7c12926a2e2e788097a45