From fb131242cc53a440d90af68c228d865af6b27384 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Sat, 22 Jun 2013 01:20:25 +0000 Subject: [PATCH] Don't need a version for postgresql on Fedora 18. * modules/jenkins/manifests/slave.pp: The postgresql package names and paths on Fedora are unversioned, so passing a version number to the postgresql Puppet module breaks there. Change-Id: I298f4cca97b905a3738a86b70a8e0b2a6e2987af Reviewed-on: https://review.openstack.org/34079 Reviewed-by: Clark Boylan Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- modules/jenkins/manifests/slave.pp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp index c3c990e4e6..452815f4de 100644 --- a/modules/jenkins/manifests/slave.pp +++ b/modules/jenkins/manifests/slave.pp @@ -239,17 +239,19 @@ class jenkins::slave( require => Database_user['openstack_citest@localhost'], } - $no_postgresql_version = 'Unsupported OS! Please check `postgres_default_version` fact.' - if $::postgres_default_version == $no_postgresql_version { - # Have a default postgres version if the postgresql module can't decide - # on a sane default for itself. - $postgresql_version = '9.1' - } - else { - $postgresql_version = $::postgres_default_version - } - class { 'postgresql::params': - version => $postgresql_version, + if ($::operatingsystem != 'Fedora') { + $no_postgresql_version = 'Unsupported OS! Please check `postgres_default_version` fact.' + if $::postgres_default_version == $no_postgresql_version { + # Have a default postgres version if the postgresql module can't decide + # on a sane default for itself. + $postgresql_version = '9.1' + } + else { + $postgresql_version = $::postgres_default_version + } + class { 'postgresql::params': + version => $postgresql_version, + } } class { 'postgresql::server':