Upgrade puppetlabs-postgresql to fix concat module
* install_modules.sh: Upgrade puppetlabs-postgresql to version 3.0.0 to fix conflicts in the concat module. Old postgresql uses ripienaar's module other modules want puppetlabs' concat module. This upgrade resolves that conflict. Change-Id: I3813abea48d933421ebb4f81e84e783fa51618db
This commit is contained in:
parent
19d6de12ad
commit
f2bfd4b0e0
@ -29,7 +29,7 @@ MODULES["puppetlabs-apache"]="0.0.4"
|
||||
MODULES["puppetlabs-apt"]="1.1.0"
|
||||
MODULES["puppetlabs-haproxy"]="0.4.1"
|
||||
MODULES["puppetlabs-mysql"]="0.6.1"
|
||||
MODULES["puppetlabs-postgresql"]="2.3.0"
|
||||
MODULES["puppetlabs-postgresql"]="3.0.0"
|
||||
MODULES["puppetlabs-stdlib"]="3.2.0"
|
||||
MODULES["saz-memcached"]="2.0.2"
|
||||
MODULES["saz-gearman"]="2.0.1"
|
||||
|
@ -241,50 +241,33 @@ class jenkins::slave(
|
||||
require => Database_user['openstack_citest@localhost'],
|
||||
}
|
||||
|
||||
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':
|
||||
config_hash => {
|
||||
'postgres_password' => 'insecure_slave',
|
||||
'manage_redhat_firewall' => false,
|
||||
'listen_addresses' => '127.0.0.1',
|
||||
},
|
||||
require => Class['postgresql::params'],
|
||||
postgres_password => 'insecure_slave',
|
||||
manage_firewall => false,
|
||||
listen_addresses => '127.0.0.1',
|
||||
require => Class['postgresql::params'],
|
||||
}
|
||||
|
||||
class { 'postgresql::devel':
|
||||
class { 'postgresql::lib::devel':
|
||||
require => Class['postgresql::params'],
|
||||
}
|
||||
|
||||
# Create DB user and explicitly make it non superuser
|
||||
# that can create databases.
|
||||
postgresql::database_user { 'openstack_citest':
|
||||
password_hash => 'openstack_citest',
|
||||
postgresql::server::role { 'openstack_citest':
|
||||
password_hash => postgresql_password('openstack_citest', 'openstack_citest'),
|
||||
createdb => true,
|
||||
superuser => false,
|
||||
require => Class['postgresql::server'],
|
||||
}
|
||||
|
||||
postgresql::db { 'openstack_citest':
|
||||
postgresql::server::db { 'openstack_citest':
|
||||
user => 'openstack_citest',
|
||||
password => 'openstack_citest',
|
||||
password => postgresql_password('openstack_citest', 'openstack_citest'),
|
||||
grant => 'all',
|
||||
require => [
|
||||
Class['postgresql::server'],
|
||||
Postgresql::Database_user['openstack_citest'],
|
||||
Postgresql::Server::Role['openstack_citest'],
|
||||
],
|
||||
}
|
||||
|
||||
@ -293,7 +276,7 @@ class jenkins::slave(
|
||||
postgresql_psql { 'ALTER DATABASE openstack_citest OWNER TO openstack_citest':
|
||||
db => 'postgres',
|
||||
refreshonly => true,
|
||||
subscribe => Postgresql::Db['openstack_citest'],
|
||||
subscribe => Postgresql::Server::Db['openstack_citest'],
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user