opendev/system-config
Code Issues Proposed changes

Don't need a version for postgresql on Fedora 18.

Browse Source 
* 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 <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Jeremy Stanley 2013-06-22 01:20:25 +00:00 committed by Jenkins
parent c958b9f82a
commit fb131242cc
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/jenkins/manifests/slave.pp
View File

@ -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':