From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Wed, 1 Apr 2020 21:31:47 +0000 (-0700)
Subject: Update role to support CentOS 8
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F63573%2F2;p=ansible%2Froles%2Flf-recommended-tools.git

Update role to support CentOS 8

* Drops installation of sshuttle as that is not presently available for
  CentOS 8

Issue: RELENG-2823
Change-Id: I426112d92cd6886c629744fa1f0cf39e800ad44f
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---

diff --git a/tasks/main.yml b/tasks/main.yml
index 989480c..bf7c301 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,6 +2,8 @@
 - name: Load operating-system specific variables
   include_vars: "{{ item }}"
   with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
+    - "{{ ansible_distribution }}.yaml"
     - "{{ ansible_os_family }}.yaml"
 
 - name: Setup Ansible PPA
diff --git a/vars/CentOS-8.yaml b/vars/CentOS-8.yaml
new file mode 100644
index 0000000..8885798
--- /dev/null
+++ b/vars/CentOS-8.yaml
@@ -0,0 +1,12 @@
+---
+lf_recommended_tools_packages_distro:
+  - bzip2
+  - fedora-packager
+  - findutils
+  - http://ftp.riken.jp/Linux/cern/centos/7/cern/x86_64/Packages/parallel-20150522-1.el7.cern.noarch.rpm
+  - nc
+  - perl-Digest-SHA
+  - perl-ExtUtils-MakeMaker
+  - perl-XML-XPath
+  - sqlite
+  - xz
diff --git a/vars/Debian.yaml b/vars/Debian.yaml
index bd84e22..f096d56 100644
--- a/vars/Debian.yaml
+++ b/vars/Debian.yaml
@@ -9,6 +9,7 @@ lf_recommended_tools_packages_distro:
   - llvm
   - netcat
   - parallel
+  - sshuttle
   - tk-dev
   - wget
   - xz-utils
diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml
index 8885798..46d31fd 100644
--- a/vars/RedHat.yaml
+++ b/vars/RedHat.yaml
@@ -8,5 +8,6 @@ lf_recommended_tools_packages_distro:
   - perl-Digest-SHA
   - perl-ExtUtils-MakeMaker
   - perl-XML-XPath
+  - sshuttle
   - sqlite
   - xz
diff --git a/vars/main.yml b/vars/main.yml
index 912d27a..77fc887 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -12,7 +12,6 @@ lf_recommended_tools_packages_common:
   - graphviz
   - jq
   - sshpass
-  - sshuttle
   - tree
   - unzip
   - wget