Showing with 27 additions and 19 deletions.
  1. +21 −15 manifests/preinstall.pp
  2. +6 −4 metadata.json
36 changes: 21 additions & 15 deletions manifests/preinstall.pp
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,30 @@
if $::redis::manage_repo {
case $::operatingsystem {
'RedHat', 'CentOS', 'Scientific', 'OEL': {
$rpm_url = $::operatingsystemrelease ? {
/^5/ => "http://download.powerstack.org/5/${::architecture}/",
/^6/ => "http://download.powerstack.org/6/${::architecture}/",
default => Fail['Operating system or release version not supported.'],
}
if $::operatingsystemrelease < 7 {
$rpm_url = $::operatingsystemrelease ? {
/^5/ => "http://download.powerstack.org/5/${::architecture}/",
/^6/ => "http://download.powerstack.org/6/${::architecture}/",
default => Fail['Operating system or release not supported.'],
}

$rpm_gpgkey = $::operatingsystemrelease ? {
/^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.'],
$rpm_gpgkey = $::operatingsystemrelease ? {
/^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 not supported.'],
}

yumrepo { 'powerstack':
descr => 'PowerStack for CentOS',
baseurl => $rpm_url,
gpgkey => $rpm_gpgkey,
enabled => 1,
gpgcheck => 1;
}
}

yumrepo { 'powerstack':
descr => 'PowerStack for CentOS',
baseurl => $rpm_url,
gpgkey => $rpm_gpgkey,
enabled => 1,
gpgcheck => 1;
if $::operatingsystemrelease == 7 {
require ::epel
}
}

Expand Down
10 changes: 6 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{
"name": "arioch-redis",
"version": "1.1.1",
"version": "1.1.2",
"author": "Tom De Vylder",
"summary": "Redis module",
"license": "Apache License, Version 2.0",
"license": "Apache-2.0",
"source": "https://github.com/arioch/puppet-redis",
"project_page": "http://arioch.github.io/puppet-redis/",
"issues_url": "https://github.com/arioch/puppet-redis/issues",
"dependencies": [
{"name":"puppetlabs/apt","version_requirement":">= 2.0.1"},
{"name":"puppetlabs/stdlib"}
{"name":"puppetlabs/apt","version_requirement":">= 2.0.1 <3.0.0"},
{"name":"puppetlabs/stdlib","version_requirement":">= 1.0.2 <3.0.0"},
{"name":"stahnma/epel","version_requirement":">= 1.0.2 <2.0.0"}
],
"data_provider": null,
"description": "Redis module with cluster support",
"tags": [
"cluster",
Expand Down