From 0b7b93fea44d79ef6eecb3ab9c83cf60c1951bfb Mon Sep 17 00:00:00 2001 From: Gael Chamoulaud Date: Tue, 8 Jul 2014 18:54:04 +0200 Subject: [PATCH] Fixes Facts string comparisons in CentOS 7 - CentOS Project has adopted a new rule for versioning numbers. The major number matches the RHEL major number, but the minor number is generated from the release date. For example, CentOS 7.1407. - Adds Support for Scientific Linux. Change-Id: I8ffb63ba3409c7595a0f13b5ec93c87b1d534d02 Closes-Bug: 1338777 Signed-off-by: Gael Chamoulaud (cherry picked from commit 0ed5b7745b6b200cdda4ae6b7d88af71498361e4) --- manifests/params.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index f5535679f..e62f58d52 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -44,8 +44,8 @@ 'Fedora', 'RedHat': { $special_service_provider = undef } - 'RedHat': { - if ($::operatingsystemrelease < 7) { + 'RedHat', 'CentOS', 'Scientific': { + if ($::operatingsystemmajrelease < 7) { $special_service_provider = 'init' } else { $special_service_provider = undef