openstack
/
puppet-designate
Code Issues Proposed changes

Fix logdir option

This commit is contained in:
Xingchao Yu 2013-09-26 21:21:17 +08:00
parent 07187bbe18
commit 9a654a36cf
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/db.pp
View File

@ -24,18 +24,13 @@ class designate::db (
} }
} }
if $backend_package and !defined(Package[$backend_package]) {
package {'designate-backend-package':
ensure => present,
name => $backend_package,
}
}
designate_config { designate_config {
'storage:sqlalchemy/database_connection': value => $database_connection; 'storage:sqlalchemy/database_connection': value => $database_connection;
} }
Designate_config['storage:sqlalchemy/database_connection'] ~> Exec['designate-dbinit'] Designate_config['storage:sqlalchemy/database_connection'] ~>
Exec['designate-dbinit'] ~>
Exec['designate-dbsync']
exec { 'designate-dbinit': exec { 'designate-dbinit':
command => $::designate::params::dbinit_command, command => $::designate::params::dbinit_command,
@ -44,7 +39,7 @@ class designate::db (
refreshonly => true, refreshonly => true,
logoutput => on_failure, logoutput => on_failure,
subscribe => Designate_config['storage:sqlalchemy/database_connection'] subscribe => Designate_config['storage:sqlalchemy/database_connection']
} ~> }
exec { 'designate-dbsync': exec { 'designate-dbsync':
command => $::designate::params::dbsync_command, command => $::designate::params::dbsync_command,
path => '/usr/bin', path => '/usr/bin',

2
manifests/init.pp
View File

@ -59,7 +59,7 @@ class designate(
designate_config { designate_config {
'DEFAULT/debug' : value => $debug; 'DEFAULT/debug' : value => $debug;
'DEFAULT/verbose' : value => $verbose; 'DEFAULT/verbose' : value => $verbose;
'DEFAULT/log_dir' : value => $::designate::params::log_dir; 'DEFAULT/logdir' : value => $::designate::params::log_dir;
'DEFAULT/state_path' : value => $::designate::params::state_path; 'DEFAULT/state_path' : value => $::designate::params::state_path;
} }