From fd43a2f3d49fadfbc0186ca81e0c9cf179e03a78 Mon Sep 17 00:00:00 2001 From: Andrew Grimberg Date: Tue, 2 Jun 2020 13:00:48 -0700 Subject: [PATCH] Merge C8 with RedHat sshuttle finally released into EPEL so the different C8 and RedHat configs are no longer needed and sshuttle can be brought back to the main configuration. Change-Id: I3d6c7bd61765cd25e5be7aa722cbf120c98630ab Signed-off-by: Andrew Grimberg --- vars/CentOS-8.yaml | 12 ------------ vars/Debian.yaml | 1 - vars/RedHat.yaml | 1 - vars/main.yml | 1 + 4 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 vars/CentOS-8.yaml diff --git a/vars/CentOS-8.yaml b/vars/CentOS-8.yaml deleted file mode 100644 index 8885798..0000000 --- a/vars/CentOS-8.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -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 f096d56..bd84e22 100644 --- a/vars/Debian.yaml +++ b/vars/Debian.yaml @@ -9,7 +9,6 @@ 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 46d31fd..8885798 100644 --- a/vars/RedHat.yaml +++ b/vars/RedHat.yaml @@ -8,6 +8,5 @@ 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 77fc887..912d27a 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -12,6 +12,7 @@ lf_recommended_tools_packages_common: - graphviz - jq - sshpass + - sshuttle - tree - unzip - wget -- 2.16.6