From 5ed7a7df879d475f44e28e242b866ca72e4d269d Mon Sep 17 00:00:00 2001 From: "Eric D. Helms" Date: Wed, 8 Apr 2020 16:39:49 -0400 Subject: [PATCH] Only install foreman-release-scl on CentOS EL 7 --- manifests/params.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index bb3f37739..1f1d95de2 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -26,8 +26,6 @@ # Additional software repos $configure_epel_repo = ($::osfamily == 'RedHat' and $::operatingsystem != 'Fedora') - # Only configure extra SCL repos on EL - $configure_scl_repo = ($::osfamily == 'RedHat' and $::operatingsystem != 'Fedora') # Advanced configuration # this can be a version or nightly @@ -108,16 +106,19 @@ $passenger_ruby = undef $passenger_ruby_package = undef $plugin_prefix = 'rubygem-foreman_' + $configure_scl_repo = false } else { $passenger_ruby = '/usr/bin/tfm-ruby' $passenger_ruby_package = 'tfm-rubygem-passenger-native' $plugin_prefix = 'tfm-rubygem-foreman_' + $configure_scl_repo = true } } 'Debian': { $passenger_ruby = '/usr/bin/foreman-ruby' $passenger_ruby_package = undef $plugin_prefix = 'ruby-foreman-' + $configure_scl_repo = false } 'Linux': { case $::operatingsystem { @@ -126,6 +127,7 @@ $passenger_ruby = '/usr/bin/tfm-ruby' $passenger_ruby_package = 'tfm-rubygem-passenger-native' $plugin_prefix = 'tfm-rubygem-foreman_' + $configure_scl_repo = true } default: { fail("${::hostname}: This module does not support operatingsystem ${::operatingsystem}")