From 88fb9c65ee94c7cd0d02c9b7b387aec9a6d09bf1 Mon Sep 17 00:00:00 2001 From: jrnt30 Date: Mon, 28 Apr 2014 11:58:29 -0500 Subject: [PATCH 1/2] puppet-redis/issues/11 - Updating to support Amazon AMI explicitly --- manifests/preinstall.pp | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/manifests/preinstall.pp b/manifests/preinstall.pp index b7626072..4157c55b 100644 --- a/manifests/preinstall.pp +++ b/manifests/preinstall.pp @@ -6,7 +6,7 @@ class redis::preinstall { if $::redis::manage_repo { case $::operatingsystem { - 'RedHat', 'CentOS', 'Scientific', 'OEL', 'Amazon': { + 'RedHat', 'CentOS', 'Scientific', 'OEL': { $rpm_url = $::operatingsystemrelease ? { /^5/ => "http://download.powerstack.org/5/${::architecture}/", /^6/ => "http://download.powerstack.org/6/${::architecture}/", @@ -28,6 +28,26 @@ } } + 'Amazon': { + $rpm_url = $::operatingsystemrelease ? { + /^3/ => "http://download.powerstack.org/6/${::architecture}/", + default => Fail['Operating system or release version not supported.'], + } + + $rpm_gpgkey = $::operatingsystemrelease ? { + /^3/ => 'https://raw.github.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack', + default => Fail['Operating system or release version not supported.'], + } + + yumrepo { 'powerstack': + descr => 'PowerStack for CentOS', + baseurl => $rpm_url, + gpgkey => $rpm_gpgkey, + enabled => 1, + gpgcheck => 1; + } + } + 'Debian': { include apt apt::key { 'dotdeb': From 833737ac9da6358103e9e3647839598f9f0f9fe4 Mon Sep 17 00:00:00 2001 From: jrnt30 Date: Mon, 28 Apr 2014 12:16:43 -0500 Subject: [PATCH 2/2] Updating GPG URL due to github redirect messing up install --- manifests/preinstall.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/preinstall.pp b/manifests/preinstall.pp index 4157c55b..7d9872e4 100644 --- a/manifests/preinstall.pp +++ b/manifests/preinstall.pp @@ -14,8 +14,8 @@ } $rpm_gpgkey = $::operatingsystemrelease ? { - /^5/ => 'https://raw.github.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack', - /^6/ => 'https://raw.github.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack', + /^5/ => 'https://raw.githubusercontent.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack', + /^6/ => 'https://raw.githubusercontent.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack', default => Fail['Operating system or release version not supported.'], } @@ -35,7 +35,7 @@ } $rpm_gpgkey = $::operatingsystemrelease ? { - /^3/ => 'https://raw.github.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack', + /^3/ => 'https://raw.githubusercontent.com/santisaez/powerstack/master/RPM-GPG-KEY-powerstack', default => Fail['Operating system or release version not supported.'], }