From 5a486a5ccad88d2b97cb42c98932db93b35ae416 Mon Sep 17 00:00:00 2001
From: Qasim Mehmood <18313886+ThisIsQasim@users.noreply.github.com>
Date: Thu, 17 Mar 2022 16:11:20 +0500
Subject: [PATCH] Calico: Fix Wireguard support for CentOS Stream 9/RHEL 9 Beta
(#8625)
---
roles/network_plugin/calico/tasks/repos.yml | 1 +
roles/network_plugin/calico/vars/centos-9.yml | 3 +++
roles/network_plugin/calico/vars/redhat-9.yml | 3 +++
3 files changed, 7 insertions(+)
create mode 100644 roles/network_plugin/calico/vars/centos-9.yml
create mode 100644 roles/network_plugin/calico/vars/redhat-9.yml
diff --git a/roles/network_plugin/calico/tasks/repos.yml b/roles/network_plugin/calico/tasks/repos.yml
index 41cbf7d0b..dd29f4520 100644
--- a/roles/network_plugin/calico/tasks/repos.yml
+++ b/roles/network_plugin/calico/tasks/repos.yml
@@ -18,3 +18,4 @@
when:
- ansible_os_family in ['RedHat']
- ansible_distribution not in ['Fedora']
+ - ansible_facts['distribution_major_version'] | int < 9
diff --git a/roles/network_plugin/calico/vars/centos-9.yml b/roles/network_plugin/calico/vars/centos-9.yml
new file mode 100644
index 000000000..43df5457a
--- /dev/null
+++ b/roles/network_plugin/calico/vars/centos-9.yml
@@ -0,0 +1,3 @@
+---
+calico_wireguard_packages:
+ - wireguard-tools
diff --git a/roles/network_plugin/calico/vars/redhat-9.yml b/roles/network_plugin/calico/vars/redhat-9.yml
new file mode 100644
index 000000000..43df5457a
--- /dev/null
+++ b/roles/network_plugin/calico/vars/redhat-9.yml
@@ -0,0 +1,3 @@
+---
+calico_wireguard_packages:
+ - wireguard-tools
--
GitLab