Merge pull request #180 from kbarber/ticket/master/pdb-1467-read-database-ordering

(PDB-1467) Ordering problem with read_database_ini
This commit is contained in:
Andrew Roetker 2015-05-07 09:16:25 -07:00
commit 4e407f8aae

View file

@ -124,6 +124,7 @@ class puppetdb::server (
store_usage => $store_usage, store_usage => $store_usage,
temp_usage => $temp_usage, temp_usage => $temp_usage,
confdir => $confdir, confdir => $confdir,
notify => Service[$puppetdb_service],
} }
class { 'puppetdb::server::database_ini': class { 'puppetdb::server::database_ini':
@ -250,12 +251,14 @@ class puppetdb::server (
Class['puppetdb::server::firewall'] -> Class['puppetdb::server::firewall'] ->
Class['puppetdb::server::config_ini'] -> Class['puppetdb::server::config_ini'] ->
Class['puppetdb::server::database_ini'] -> Class['puppetdb::server::database_ini'] ->
Class['puppetdb::server::read_database_ini'] ->
Class['puppetdb::server::jetty_ini'] -> Class['puppetdb::server::jetty_ini'] ->
Service[$puppetdb_service] Service[$puppetdb_service]
} else { } else {
Package[$puppetdb_package] -> Package[$puppetdb_package] ->
Class['puppetdb::server::config_ini'] -> Class['puppetdb::server::config_ini'] ->
Class['puppetdb::server::database_ini'] -> Class['puppetdb::server::database_ini'] ->
Class['puppetdb::server::read_database_ini'] ->
Class['puppetdb::server::jetty_ini'] -> Class['puppetdb::server::jetty_ini'] ->
Service[$puppetdb_service] Service[$puppetdb_service]
} }