opendev/system-config
Code Issues Proposed changes

Specify postgresql version on Jenkins slaves.

Browse Source 
The fact built into the postgresql module cannot determine which version
of postgresql to use in all cases (eg on Oneiric hosts). To get around
this hardcode the version to '9.1' when a default is not found by the
upstream module.

Change-Id: If5e4e0d7325d1507353d907cab4539260c7d4bc0
Reviewed-on: https://review.openstack.org/20196
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2013-01-21 16:20:53 -08:00 committed by Jenkins
parent c6b606550d
commit e262a51bee
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,14 +175,31 @@ class jenkins::slave(
], ],
} }
$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': class { 'postgresql::server':
config_hash => { config_hash => {
'postgres_password' => 'insecure_slave', 'postgres_password' => 'insecure_slave',
'manage_redhat_firewall' => false, 'manage_redhat_firewall' => false,
'listen_addresses' => '127.0.0.1', 'listen_addresses' => '127.0.0.1',
}, },
require => Class['postgresql::params'],
}
class { 'postgresql::devel':
require => Class['postgresql::params'],
} }
include postgresql::devel
postgresql::db { 'openstack_citest': postgresql::db { 'openstack_citest':
user => 'openstack_citest', user => 'openstack_citest',