From 1a1f20c052e32dd1159cfb7ccfc0f4f3b213f06a Mon Sep 17 00:00:00 2001 From: Mirek Bauer Date: Tue, 31 Jan 2017 14:36:15 +0100 Subject: [PATCH] Use operatingsystemmajrelease fact in el repo url --- manifests/install.pp | 2 +- spec/classes/grafana_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/install.pp b/manifests/install.pp index 8ab4b1e30..191509643 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -99,7 +99,7 @@ if ( $::grafana::manage_package_repo ){ yumrepo { 'grafana': descr => 'grafana repo', - baseurl => 'https://packagecloud.io/grafana/stable/el/6/$basearch', + baseurl => "https://packagecloud.io/grafana/stable/el/${::operatingsystemmajrelease}/\$basearch", gpgcheck => 1, gpgkey => 'https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana', enabled => 1, diff --git a/spec/classes/grafana_spec.rb b/spec/classes/grafana_spec.rb index 8d9b2ea72..f0606c203 100644 --- a/spec/classes/grafana_spec.rb +++ b/spec/classes/grafana_spec.rb @@ -70,7 +70,7 @@ end when 'RedHat' describe 'yum repo dependencies first' do - it { is_expected.to contain_yumrepo('grafana').with(baseurl: 'https://packagecloud.io/grafana/stable/el/6/$basearch', gpgkey: 'https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana', enabled: 1) } + it { is_expected.to contain_yumrepo('grafana').with(baseurl: 'https://packagecloud.io/grafana/stable/el/' + facts[:operatingsystemmajrelease] + '/$basearch', gpgkey: 'https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana', enabled: 1) } it { is_expected.to contain_yumrepo('grafana').that_comes_before('Package[grafana]') } end