From 51a58182609833524e52fc0d8519810b2629d485 Mon Sep 17 00:00:00 2001 From: Teemu Matilainen Date: Fri, 12 Apr 2013 09:54:10 -0300 Subject: [PATCH] Remove most version detections from EL family distros Omnibus installer supports generally new releases fast, so we don't need to check the version. There is not much difference if we don't support some version or if the omnibus installer fails. In both cases the user has to install Chef manually (or file an issue to us to make an exception). --- lib/knife-solo/bootstraps/linux.rb | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/lib/knife-solo/bootstraps/linux.rb b/lib/knife-solo/bootstraps/linux.rb index 1728b596..3637e8d1 100644 --- a/lib/knife-solo/bootstraps/linux.rb +++ b/lib/knife-solo/bootstraps/linux.rb @@ -66,27 +66,15 @@ def distro {:type => (x86? ? "debianoid_omnibus" : "debianoid_gem")} when %r{Linaro} {:type => "debianoid_gem"} - when %r{CentOS.*? 5} - {:type => "yum_omnibus"} - when %r{CentOS.*? 6} + when %r{CentOS} {:type => "yum_omnibus"} when %r{Amazon Linux} {:type => "yum_omnibus"} - when %r{Red Hat Enterprise.*? 5} - {:type => "yum_omnibus"} - when %r{Red Hat Enterprise.*? 6} - {:type => "yum_omnibus"} - when %r{Fedora release.*? 15} - {:type => "yum_omnibus"} - when %r{Fedora release.*? 16} - {:type => "yum_omnibus"} - when %r{Fedora release.*? 17} - {:type => "yum_omnibus"} - when %r{Fedora release.*? 18} + when %r{Red Hat Enterprise} {:type => "yum_omnibus"} - when %r{Scientific Linux.*? 5} + when %r{Fedora release} {:type => "yum_omnibus"} - when %r{Scientific Linux.*? 6} + when %r{Scientific Linux} {:type => "yum_omnibus"} when %r{SUSE Linux Enterprise Server 1[12]} {:type => "omnibus"}