diff --git a/puppet-manifests/src/hieradata/controller.yaml b/puppet-manifests/src/hieradata/controller.yaml index b3e4feb712..3fe7214417 100644 --- a/puppet-manifests/src/hieradata/controller.yaml +++ b/puppet-manifests/src/hieradata/controller.yaml @@ -259,6 +259,9 @@ nova::network::neutron::default_floating_pool: 'public' nova_api_proxy::config::enabled: false nova_api_proxy::config::eventlet_pool_size: 256 +nova_api_proxy::config::use_syslog: true +nova_api_proxy::config::log_facility: 'local5' + # this will trigger simple_setup for cell_v2 nova::db::sync_api::cellv2_setup: true diff --git a/puppet-modules-wrs/puppet-nova_api_proxy/src/nova_api_proxy/manifests/config.pp b/puppet-modules-wrs/puppet-nova_api_proxy/src/nova_api_proxy/manifests/config.pp index 5aec4e2580..ca5fbe5b7b 100644 --- a/puppet-modules-wrs/puppet-nova_api_proxy/src/nova_api_proxy/manifests/config.pp +++ b/puppet-modules-wrs/puppet-nova_api_proxy/src/nova_api_proxy/manifests/config.pp @@ -34,6 +34,11 @@ class nova_api_proxy::config ( $user_domain_name = 'Default', $project_domain_name = 'Default', $eventlet_pool_size = 128, + $use_syslog = false, + $log_facility = 'LOG_USER', + $use_stderr = false, + $log_file = 'nova-api-proxy.log', + $log_dir = '/var/log/nova', ) { # SSL Options @@ -78,6 +83,20 @@ class nova_api_proxy::config ( } } + if $use_syslog { + proxy_config { + 'DEFAULT/use_syslog': value => true; + 'DEFAULT/syslog_log_facility': value => $log_facility; + } + } else { + proxy_config { + 'DEFAULT/use_syslog': value => false; + 'DEFAULT/use_stderr': value => false; + 'DEFAULT/log_file' : value => $log_file; + 'DEFAULT/log_dir' : value => $log_dir; + } + } + if $auth_uri { $auth_uri_real = $auth_uri } else {