stackforge/puppet-openstack-cloud
Code Issues Proposed changes

[identity] Disable fs logging if syslog is enabled (refs: #187)

Browse Source
This commit is contained in:
Sebastien Badia 2014-02-20 19:20:49 +01:00
parent e127151ce3
commit ad282d0b51
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/identity.pp
View File

@ -400,6 +400,13 @@ class cloud::identity (
$ks_token_expiration = $os_params::ks_token_expiration $ks_token_expiration = $os_params::ks_token_expiration
){ ){
# Disable twice logging if syslog is enabled
if $use_syslog {
$log_dir = false
} else {
$log_dir = '/var/log/keystone'
}
$encoded_user = uriescape($keystone_db_user) $encoded_user = uriescape($keystone_db_user)
$encoded_password = uriescape($keystone_db_password) $encoded_password = uriescape($keystone_db_password)
@ -418,6 +425,7 @@ class cloud::identity (
use_syslog => $use_syslog, use_syslog => $use_syslog,
verbose => $verbose, verbose => $verbose,
bind_host => $api_eth, bind_host => $api_eth,
log_dir => $log_dir,
public_port => $ks_keystone_public_port, public_port => $ks_keystone_public_port,
admin_port => $ks_keystone_admin_port, admin_port => $ks_keystone_admin_port,
token_expiration => $ks_token_expiration token_expiration => $ks_token_expiration