Adapt puppetlabs-postgresql to Fuel
Fuel uses a custom package name "postgresql" instead of "postgresql94", so this value needs to be passed, along with bindir value. Also adapted all manifest references to postgresql::db to postgresql::server::db. Change-Id: I1ec329ee31ecc6edfd357329bfc84df95ecf7ddc Closes-Bug: #1386118
This commit is contained in:
parent
e97c8338c9
commit
1f1617b8cf
@ -10,10 +10,10 @@ class cinder::db::postgresql(
|
|||||||
|
|
||||||
require postgresql::python
|
require postgresql::python
|
||||||
|
|
||||||
Postgresql::Db[$dbname] ~> Exec<| title == 'cinder-manage db_sync' |>
|
Postgresql::Server::Db[$dbname] ~> Exec<| title == 'cinder-manage db_sync' |>
|
||||||
Package['python-psycopg2'] -> Exec<| title == 'cinder-manage db_sync' |>
|
Package['python-psycopg2'] -> Exec<| title == 'cinder-manage db_sync' |>
|
||||||
|
|
||||||
postgresql::db { $dbname:
|
postgresql::server::db { $dbname:
|
||||||
user => $user,
|
user => $user,
|
||||||
password => $password,
|
password => $password,
|
||||||
}
|
}
|
||||||
|
@ -10,10 +10,10 @@ class glance::db::postgresql(
|
|||||||
|
|
||||||
require postgresql::python
|
require postgresql::python
|
||||||
|
|
||||||
Postgresql::Db[$dbname] ~> Exec<| title == 'glance-manage db_sync' |>
|
Postgresql::Server::Db[$dbname] ~> Exec<| title == 'glance-manage db_sync' |>
|
||||||
Package['python-psycopg2'] -> Exec<| title == 'glance-manage db_sync' |>
|
Package['python-psycopg2'] -> Exec<| title == 'glance-manage db_sync' |>
|
||||||
|
|
||||||
postgresql::db { $dbname:
|
postgresql::server::db { $dbname:
|
||||||
user => $user,
|
user => $user,
|
||||||
password => $password,
|
password => $password,
|
||||||
}
|
}
|
||||||
|
@ -42,11 +42,11 @@ class keystone::db::postgresql(
|
|||||||
Class['keystone::db::postgresql'] -> Exec<| title == 'keystone-manage db_sync' |>
|
Class['keystone::db::postgresql'] -> Exec<| title == 'keystone-manage db_sync' |>
|
||||||
#require 'postgresql::python'
|
#require 'postgresql::python'
|
||||||
|
|
||||||
postgresql::db { "${dbname}":
|
postgresql::server::db { "${dbname}":
|
||||||
user => "${user}",
|
user => "${user}",
|
||||||
password => "${password}",
|
password => "${password}",
|
||||||
}
|
}
|
||||||
|
|
||||||
Postgresql::Db[$dbname] ~> Exec<| title == 'keystone-manage db_sync' |>
|
Postgresql::Server::Db[$dbname] ~> Exec<| title == 'keystone-manage db_sync' |>
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ if $production == 'prod'{
|
|||||||
}
|
}
|
||||||
|
|
||||||
# this replaces removed postgresql version fact
|
# this replaces removed postgresql version fact
|
||||||
$postgres_default_version = '8.4'
|
$postgres_default_version = '9.3'
|
||||||
|
|
||||||
$mco_host = $::fuel_settings['ADMIN_NETWORK']['ipaddress']
|
$mco_host = $::fuel_settings['ADMIN_NETWORK']['ipaddress']
|
||||||
$mco_pskey = "unset"
|
$mco_pskey = "unset"
|
||||||
|
@ -11,7 +11,7 @@ if $production {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# this replaces removed postgresql version fact
|
# this replaces removed postgresql version fact
|
||||||
$postgres_default_version = '8.4'
|
$postgres_default_version = '9.3'
|
||||||
|
|
||||||
node default {
|
node default {
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ $env_path = "/usr"
|
|||||||
$staticdir = "/usr/share/nailgun/static"
|
$staticdir = "/usr/share/nailgun/static"
|
||||||
|
|
||||||
# this replaces removed postgresql version fact
|
# this replaces removed postgresql version fact
|
||||||
$postgres_default_version = '8.4'
|
$postgres_default_version = '9.3'
|
||||||
|
|
||||||
$centos_repos =
|
$centos_repos =
|
||||||
[
|
[
|
||||||
|
@ -18,7 +18,7 @@ if $production == 'prod'{
|
|||||||
}
|
}
|
||||||
|
|
||||||
# this replaces removed postgresql version fact
|
# this replaces removed postgresql version fact
|
||||||
$postgres_default_version = '8.4'
|
$postgres_default_version = '9.3'
|
||||||
|
|
||||||
|
|
||||||
node default {
|
node default {
|
||||||
|
@ -1,13 +1,17 @@
|
|||||||
$fuel_settings = parseyaml($astute_settings_yaml)
|
$fuel_settings = parseyaml($astute_settings_yaml)
|
||||||
|
|
||||||
$postgres_default_version = '8.4'
|
$postgres_default_version = '9.3'
|
||||||
|
|
||||||
# install and configure postgresql server
|
# install and configure postgresql server
|
||||||
|
class { 'postgresql::globals':
|
||||||
|
version => $postgres_default_version,
|
||||||
|
bindir => "/usr/pgsql-${postgres_default_version}/bin",
|
||||||
|
server_package_name => "postgresql-server",
|
||||||
|
client_package_name => "postgresql",
|
||||||
|
}
|
||||||
class { 'postgresql::server':
|
class { 'postgresql::server':
|
||||||
config_hash => {
|
listen_addresses => '0.0.0.0',
|
||||||
'ip_mask_allow_all_users' => '0.0.0.0/0',
|
ip_mask_allow_all_users => '0.0.0.0/0',
|
||||||
'listen_addresses' => '0.0.0.0',
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# nailgun db and grants
|
# nailgun db and grants
|
||||||
@ -30,7 +34,7 @@ $keystone_dbname = $::fuel_settings['postgres']['keystone_dbname']
|
|||||||
$keystone_dbuser = $::fuel_settings['postgres']['keystone_user']
|
$keystone_dbuser = $::fuel_settings['postgres']['keystone_user']
|
||||||
$keystone_dbpass = $::fuel_settings['postgres']['keystone_password']
|
$keystone_dbpass = $::fuel_settings['postgres']['keystone_password']
|
||||||
|
|
||||||
postgresql::db { $keystone_dbname:
|
postgresql::server::db { $keystone_dbname:
|
||||||
user => $keystone_dbuser,
|
user => $keystone_dbuser,
|
||||||
password => $keystone_dbpass,
|
password => $keystone_dbpass,
|
||||||
grant => 'all',
|
grant => 'all',
|
||||||
@ -42,10 +46,9 @@ $ostf_dbname = $::fuel_settings['postgres']['ostf_dbname']
|
|||||||
$ostf_dbuser = $::fuel_settings['postgres']['ostf_user']
|
$ostf_dbuser = $::fuel_settings['postgres']['ostf_user']
|
||||||
$ostf_dbpass = $::fuel_settings['postgres']['ostf_password']
|
$ostf_dbpass = $::fuel_settings['postgres']['ostf_password']
|
||||||
|
|
||||||
postgresql::db { $ostf_dbname:
|
postgresql::server::db { $ostf_dbname:
|
||||||
user => $ostf_dbuser,
|
user => $ostf_dbuser,
|
||||||
password => $ostf_dbpass,
|
password => $ostf_dbpass,
|
||||||
grant => 'all',
|
grant => 'all',
|
||||||
require => Class['::postgresql::server'],
|
require => Class['::postgresql::server'],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ if $production == 'prod'{
|
|||||||
}
|
}
|
||||||
|
|
||||||
# this replaces removed postgresql version fact
|
# this replaces removed postgresql version fact
|
||||||
$postgres_default_version = '8.4'
|
$postgres_default_version = '9.3'
|
||||||
|
|
||||||
|
|
||||||
node default {
|
node default {
|
||||||
|
@ -12,7 +12,7 @@ $env_path = "/usr"
|
|||||||
$staticdir = "/usr/share/nailgun/static"
|
$staticdir = "/usr/share/nailgun/static"
|
||||||
|
|
||||||
# this replaces removed postgresql version fact
|
# this replaces removed postgresql version fact
|
||||||
$postgres_default_version = '8.4'
|
$postgres_default_version = '9.3'
|
||||||
|
|
||||||
node default {
|
node default {
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ class nailgun::database(
|
|||||||
$password,
|
$password,
|
||||||
$dbname,
|
$dbname,
|
||||||
){
|
){
|
||||||
postgresql::db{ $dbname:
|
postgresql::server::db{ $dbname:
|
||||||
user => $user,
|
user => $user,
|
||||||
password => $password,
|
password => $password,
|
||||||
grant => 'all',
|
grant => 'all',
|
||||||
|
@ -21,7 +21,7 @@ class nailgun::ostf(
|
|||||||
package{'libevent-devel':}
|
package{'libevent-devel':}
|
||||||
package{'openssl-devel':}
|
package{'openssl-devel':}
|
||||||
if $production !~ /docker/ {
|
if $production !~ /docker/ {
|
||||||
postgresql::db{ $dbname:
|
postgresql::server::db{ $dbname:
|
||||||
user => $dbuser,
|
user => $dbuser,
|
||||||
password => $dbpass,
|
password => $dbpass,
|
||||||
grant => 'all',
|
grant => 'all',
|
||||||
@ -38,7 +38,7 @@ class nailgun::ostf(
|
|||||||
tries => 50,
|
tries => 50,
|
||||||
try_sleep => 5,
|
try_sleep => 5,
|
||||||
}
|
}
|
||||||
Postgresql::Db<| title == $dbname|> ->
|
Postgresql::Server::Db<| title == $dbname|> ->
|
||||||
Exec['ostf-init'] -> Class['nailgun::supervisor']
|
Exec['ostf-init'] -> Class['nailgun::supervisor']
|
||||||
Package["fuel-ostf"] -> Exec['ostf-init']
|
Package["fuel-ostf"] -> Exec['ostf-init']
|
||||||
File["/etc/ostf/ostf.conf"] -> Exec['ostf-init']
|
File["/etc/ostf/ostf.conf"] -> Exec['ostf-init']
|
||||||
|
@ -24,11 +24,11 @@ class nova::db::postgresql(
|
|||||||
|
|
||||||
require 'postgresql::python'
|
require 'postgresql::python'
|
||||||
|
|
||||||
Postgresql::Db[$dbname] -> Anchor<| title == 'nova-start' |>
|
Postgresql::Server::Db[$dbname] -> Anchor<| title == 'nova-start' |>
|
||||||
Postgresql::Db[$dbname] ~> Exec<| title == 'nova-db-sync' |>
|
Postgresql::Server::Db[$dbname] ~> Exec<| title == 'nova-db-sync' |>
|
||||||
Package['python-psycopg2'] -> Exec<| title == 'nova-db-sync' |>
|
Package['python-psycopg2'] -> Exec<| title == 'nova-db-sync' |>
|
||||||
|
|
||||||
postgresql::db { $dbname:
|
postgresql::server::db { $dbname:
|
||||||
user => $user,
|
user => $user,
|
||||||
password => $password,
|
password => $password,
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user