openstack
/
fuel-library
Code Issues Proposed changes

Fix upstart logs management 

- disable use_stderr option for all components because upstart adds to logs
  all output from stderr output of its jobs
- add upstart logs to common fuel logrotate configuration file
- add noop tests

Change-Id: Ifefec5e4c8e3438229018edc7c1aaa53a3a779bd
Upstream patches: https://review.openstack.org/#/q/topic:bug/1482564,n,z
Closes-bug: #1469176
This commit is contained in:
Sergey Kolekonov 2015-08-05 16:07:01 +03:00
parent 22f848670e
commit 8637d96478
57 changed files with 198 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/puppet/ceilometer/manifests/init.pp
View File

@ -33,6 +33,9 @@
# [*use_syslog*]
# (optional) Use syslog for logging
# Defaults to false
# [*use_stderr*]
# (optional) Log output to standard error
# Defaults to true
# [*log_facility*]
# (optional) Syslog facility to receive log lines.
# Defaults to 'LOG_USER'
@ -96,6 +99,7 @@ class ceilometer(
$log_dir = '/var/log/ceilometer',
$verbose = false,
$use_syslog = false,
$use_stderr = true,
$log_facility = 'LOG_USER',
$rpc_backend = 'ceilometer.openstack.common.rpc.impl_kombu',
$rabbit_host = '127.0.0.1',
@ -271,6 +275,7 @@ class ceilometer(
'publisher/metering_secret' : value => $metering_secret, secret => true;
'DEFAULT/debug' : value => $debug;
'DEFAULT/verbose' : value => $verbose;
'DEFAULT/use_stderr' : value => $use_stderr;
'DEFAULT/notification_topics' : value => join($notification_topics, ',');
'database/event_time_to_live' : value => $event_time_to_live;
'database/metering_time_to_live' : value => $metering_time_to_live;

4
deployment/puppet/ceilometer/spec/classes/ceilometer_init_spec.rb
View File

@ -157,6 +157,10 @@ describe 'ceilometer' do
is_expected.to contain_ceilometer_config('DEFAULT/use_syslog').with_value('false')
end
it 'configures use_stderr to be enabled by default' do
is_expected.to contain_ceilometer_config('DEFAULT/use_stderr').with_value('true')
end
context 'with syslog enabled' do
before { params.merge!( :use_syslog => 'true' ) }

6
deployment/puppet/cinder/manifests/init.pp
View File

@ -20,6 +20,10 @@
# (Optional) Use syslog for logging.
# Defaults to false.
#
# [*use_stderr*]
# (optional) Log output to standard error
# Defaults to true
#
# [*database_connection*]
# Url used to connect to database.
# (Optional) Defaults to
@ -263,6 +267,7 @@ class cinder (
$log_dir = '/var/log/cinder',
$verbose = false,
$debug = false,
$use_stderr = true,
$storage_availability_zone = 'nova',
$default_availability_zone = false,
$enable_v1_api = true,
@ -411,6 +416,7 @@ class cinder (
'database/retry_interval': value => $database_retry_interval;
'DEFAULT/verbose': value => $verbose;
'DEFAULT/debug': value => $debug;
'DEFAULT/use_stderr': value => $use_stderr;
'DEFAULT/api_paste_config': value => $api_paste_config;
'DEFAULT/rpc_backend': value => $rpc_backend;
'DEFAULT/storage_availability_zone': value => $storage_availability_zone;

1
deployment/puppet/cinder/spec/classes/cinder_spec.rb
View File

@ -40,6 +40,7 @@ describe 'cinder' do
is_expected.to contain_cinder_config('DEFAULT/api_paste_config').with(:value => '/etc/cinder/api-paste.ini')
is_expected.to contain_cinder_config('DEFAULT/log_dir').with(:value => '/var/log/cinder')
is_expected.to contain_cinder_config('DEFAULT/lock_path').with(:value => '/var/lock/cinder')
is_expected.to contain_cinder_config('DEFAULT/use_stderr').with(:value => true)
end
end

6
deployment/puppet/glance/manifests/api.pp
View File

@ -125,6 +125,10 @@
# (optional) Use syslog for logging.
# Defaults to false.
#
# [*use_stderr*]
# (optional) Log output to standard error
# Defaults to true
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines.
# Defaults to 'LOG_USER'.
@ -210,6 +214,7 @@ class glance::api(
$manage_service = true,
$enabled = true,
$use_syslog = false,
$use_stderr = true,
$log_facility = 'LOG_USER',
$show_image_direct_url = false,
$purge_config = false,
@ -293,6 +298,7 @@ class glance::api(
glance_api_config {
'DEFAULT/verbose': value => $verbose;
'DEFAULT/debug': value => $debug;
'DEFAULT/use_stderr': value => $use_stderr;
'DEFAULT/bind_host': value => $bind_host;
'DEFAULT/bind_port': value => $bind_port;
'DEFAULT/backlog': value => $backlog;

14
deployment/puppet/glance/manifests/registry.pp
View File

@ -86,6 +86,10 @@
# (optional) Use syslog for logging.
# Defaults to false.
#
# [*use_stderr*]
# (optional) Log output to standard error
# Defaults to true
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines.
# Defaults to LOG_USER.
@ -140,6 +144,7 @@ class glance::registry(
$keystone_user = 'glance',
$pipeline = 'keystone',
$use_syslog = false,
$use_stderr = true,
$log_facility = 'LOG_USER',
$manage_service = true,
$enabled = true,
@ -204,10 +209,11 @@ class glance::registry(
}
glance_registry_config {
'DEFAULT/verbose': value => $verbose;
'DEFAULT/debug': value => $debug;
'DEFAULT/bind_host': value => $bind_host;
'DEFAULT/bind_port': value => $bind_port;
'DEFAULT/verbose': value => $verbose;
'DEFAULT/debug': value => $debug;
'DEFAULT/use_stderr': value => $use_stderr;
'DEFAULT/bind_host': value => $bind_host;
'DEFAULT/bind_port': value => $bind_port;
}
if $identity_uri {

2
deployment/puppet/glance/spec/classes/glance_api_spec.rb
View File

@ -13,6 +13,7 @@ describe 'glance::api' do
{
:verbose => false,
:debug => false,
:use_stderr => true,
:bind_host => '0.0.0.0',
:bind_port => '9292',
:registry_host => '0.0.0.0',
@ -97,6 +98,7 @@ describe 'glance::api' do
[
'verbose',
'debug',
'use_stderr',
'bind_host',
'bind_port',
'registry_host',

2
deployment/puppet/glance/spec/classes/glance_registry_spec.rb
View File

@ -11,6 +11,7 @@ describe 'glance::registry' do
{
:verbose => false,
:debug => false,
:use_stderr => true,
:bind_host => '0.0.0.0',
:bind_port => '9191',
:log_file => '/var/log/glance/registry.log',
@ -97,6 +98,7 @@ describe 'glance::registry' do
[
'verbose',
'debug',
'use_stderr',
'bind_port',
'bind_host',
].each do |config|

6
deployment/puppet/heat/manifests/init.pp
View File

@ -136,6 +136,10 @@
# (Optional) Use syslog for logging.
# Defaults to false.
#
# [*use_stderr*]
# (optional) Log output to standard error
# Defaults to true
#
# [*log_facility*]
# (Optional) Syslog facility to receive log lines.
# Defaults to LOG_USER.
@ -228,6 +232,7 @@ class heat(
$database_connection = 'sqlite:////var/lib/heat/heat.sqlite',
$database_idle_timeout = 3600,
$use_syslog = false,
$use_stderr = true,
$log_facility = 'LOG_USER',
$flavor = undef,
$region_name = undef,
@ -450,6 +455,7 @@ class heat(
'DEFAULT/rpc_backend' : value => $rpc_backend;
'DEFAULT/debug' : value => $debug;
'DEFAULT/verbose' : value => $verbose;
'DEFAULT/use_stderr' : value => $use_stderr;
'ec2authtoken/auth_uri' : value => $keystone_ec2_uri;
'keystone_authtoken/admin_tenant_name' : value => $keystone_tenant;
'keystone_authtoken/admin_user' : value => $keystone_user;

5
deployment/puppet/heat/spec/classes/heat_init_spec.rb
View File

@ -7,6 +7,7 @@ describe 'heat' do
:package_ensure => 'present',
:verbose => 'False',
:debug => 'False',
:use_stderr => 'True',
:log_dir => '/var/log/heat',
:rabbit_host => '127.0.0.1',
:rabbit_port => 5672,
@ -133,6 +134,10 @@ describe 'heat' do
is_expected.to contain_heat_config('DEFAULT/verbose').with_value( params[:verbose] )
end
it 'configures use_stderr' do
is_expected.to contain_heat_config('DEFAULT/use_stderr').with_value( params[:use_stderr] )
end
it 'configures auth_uri' do
is_expected.to contain_heat_config('keystone_authtoken/auth_uri').with_value( params[:auth_uri] )
end

6
deployment/puppet/keystone/manifests/init.pp
View File

@ -41,6 +41,10 @@
# (optional) Use syslog for logging.
# Defaults to false.
#
# [*use_stderr*]
# (optional) Log output to standard error
# Defaults to true
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines.
# Defaults to 'LOG_USER'.
@ -413,6 +417,7 @@ class keystone(
$log_dir = '/var/log/keystone',
$log_file = false,
$use_syslog = false,
$use_stderr = true,
$log_facility = 'LOG_USER',
$catalog_type = 'sql',
$catalog_driver = false,
@ -568,6 +573,7 @@ class keystone(
'DEFAULT/admin_port': value => $admin_port;
'DEFAULT/verbose': value => $verbose;
'DEFAULT/debug': value => $debug;
'DEFAULT/use_stderr': value => $use_stderr;
}
if $compute_port {

5
deployment/puppet/keystone/spec/classes/keystone_spec.rb
View File

@ -30,6 +30,7 @@ describe 'keystone' do
'admin_token' => 'service_token',
'verbose' => false,
'debug' => false,
'use_stderr' => true,
'catalog_type' => 'sql',
'catalog_driver' => false,
'token_provider' => 'keystone.token.providers.uuid.Provider',
@ -69,6 +70,7 @@ describe 'keystone' do
'admin_token' => 'service_token_override',
'verbose' => true,
'debug' => true,
'use_stderr' => false,
'catalog_type' => 'template',
'token_provider' => 'keystone.token.providers.uuid.Provider',
'token_driver' => 'keystone.token.backends.kvs.Token',
@ -152,7 +154,8 @@ describe 'keystone' do
'public_port',
'admin_port',
'verbose',
'debug'
'debug',
'use_stderr'
].each do |config|
is_expected.to contain_keystone_config("DEFAULT/#{config}").with_value(param_hash[config])
end

6
deployment/puppet/murano/manifests/init.pp
View File

@ -20,6 +20,10 @@
# (Optional) Should the service use Syslog
# Defaults to false
#
# [*use_stderr*]
# (Optional) Log output to standard error
# Defaults to true
#
# [*log_facility*]
# (Optional) Syslog facility to recieve logs
# Defaults to 'LOG_LOCAL0'
@ -133,6 +137,7 @@ class murano(
$verbose = false,
$debug = false,
$use_syslog = false,
$use_stderr = true,
$log_facility = 'LOG_LOCAL0',
$log_dir = '/var/log/murano',
$data_dir = '/var/cache/murano',
@ -214,6 +219,7 @@ class murano(
murano_config {
'DEFAULT/verbose' : value => $verbose;
'DEFAULT/debug' : value => $debug;
'DEFAULT/use_stderr' : value => $use_stderr;
'DEFAULT/log_dir' : value => $log_dir;
'DEFAULT/notification_driver' : value => $notification_driver;

6
deployment/puppet/neutron/manifests/init.pp
View File

@ -210,6 +210,10 @@
# (optional) Use syslog for logging
# Defaults to false
#
# [*use_stderr*]
# (optional) Log output to standard error
# Defaults to true
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines
# Defaults to LOG_USER
@ -292,6 +296,7 @@ class neutron (
$key_file = false,
$ca_file = false,
$use_syslog = false,
$use_stderr = true,
$log_facility = 'LOG_USER',
$log_file = false,
$log_dir = '/var/log/neutron',
@ -355,6 +360,7 @@ class neutron (
neutron_config {
'DEFAULT/verbose': value => $verbose;
'DEFAULT/debug': value => $debug;
'DEFAULT/use_stderr': value => $use_stderr;
'DEFAULT/bind_host': value => $bind_host;
'DEFAULT/bind_port': value => $bind_port;
'DEFAULT/auth_strategy': value => $auth_strategy;

2
deployment/puppet/neutron/spec/classes/neutron_init_spec.rb
View File

@ -6,6 +6,7 @@ describe 'neutron' do
{ :package_ensure => 'present',
:verbose => false,
:debug => false,
:use_stderr => true,
:core_plugin => 'linuxbridge',
:rabbit_host => '127.0.0.1',
:rabbit_port => 5672,
@ -119,6 +120,7 @@ describe 'neutron' do
it 'configures neutron.conf' do
is_expected.to contain_neutron_config('DEFAULT/verbose').with_value( params[:verbose] )
is_expected.to contain_neutron_config('DEFAULT/use_stderr').with_value( params[:use_stderr] )
is_expected.to contain_neutron_config('DEFAULT/bind_host').with_value('0.0.0.0')
is_expected.to contain_neutron_config('DEFAULT/bind_port').with_value('9696')
is_expected.to contain_neutron_config('DEFAULT/auth_strategy').with_value('keystone')

6
deployment/puppet/nova/manifests/init.pp
View File

@ -172,6 +172,10 @@
# (optional) Use syslog for logging
# Defaults to false
#
# [*use_stderr*]
# (optional) Log output to standard error
# Defaults to true
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines.
# Defaults to 'LOG_USER'
@ -295,6 +299,7 @@ class nova(
$nova_public_key = undef,
$nova_private_key = undef,
$use_syslog = false,
$use_stderr = true,
$log_facility = 'LOG_USER',
$install_utilities = true,
$notification_driver = [],
@ -594,6 +599,7 @@ class nova(
nova_config {
'DEFAULT/verbose': value => $verbose;
'DEFAULT/debug': value => $debug;
'DEFAULT/use_stderr': value => $use_stderr;
'DEFAULT/rpc_backend': value => $rpc_backend;
'DEFAULT/notification_driver': value => $notification_driver_real;
'DEFAULT/notification_topics': value => $notification_topics;

1
deployment/puppet/nova/spec/classes/nova_init_spec.rb
View File

@ -67,6 +67,7 @@ describe 'nova' do
it 'configures various things' do
is_expected.to contain_nova_config('DEFAULT/verbose').with_value(false)
is_expected.to contain_nova_config('DEFAULT/debug').with_value(false)
is_expected.to contain_nova_config('DEFAULT/use_stderr').with_value(true)
is_expected.to contain_nova_config('DEFAULT/log_dir').with_value('/var/log/nova')
is_expected.to contain_nova_config('DEFAULT/state_path').with_value('/var/lib/nova')
is_expected.to contain_nova_config('DEFAULT/lock_path').with_value(platform_params[:lock_path])

4
deployment/puppet/openstack/manifests/ceilometer.pp
View File

@ -3,6 +3,8 @@
#
# Installs and configures Ceilometer
#
# [use_stderr] Rather or not service should send output to stderr. Optional. Defaults to true.
#
class openstack::ceilometer (
$keystone_password = 'ceilometer_pass',
@ -12,6 +14,7 @@ class openstack::ceilometer (
$metering_secret = 'ceilometer',
$verbose = false,
$use_syslog = false,
$use_stderr = true,
$syslog_log_facility = 'LOG_LOCAL0',
$debug = false,
$db_type = 'mysql',
@ -54,6 +57,7 @@ class openstack::ceilometer (
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
}

3
deployment/puppet/openstack/manifests/cinder.pp
View File

@ -1,4 +1,5 @@
# [*use_syslog*] Rather or not service should log to syslog. Optional. Defaults to false.
# [*use_stderr*] Rather or not service should send output to stderr. Optional. Defaults to true.
# [*syslog_log_facility*] Facility for syslog, if used. Optional. Note: duplicating conf option
# wouldn't have been used, but more powerfull rsyslog features managed via conf template instead
@ -24,6 +25,7 @@ class openstack::cinder(
$bind_host = '0.0.0.0',
$iscsi_bind_host = '0.0.0.0',
$use_syslog = false,
$use_stderr = true,
$syslog_log_facility = 'LOG_LOCAL3',
$cinder_rate_limits = undef,
$verbose = false,
@ -100,6 +102,7 @@ class openstack::cinder(
database_connection => $sql_connection,
verbose => $verbose,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
debug => $debug,
database_idle_timeout => $idle_timeout,

3
deployment/puppet/openstack/manifests/compute.pp
View File

@ -43,6 +43,7 @@
# [nova_volumes] Name of volume group in which nova-volume will create logical volumes.
# Optional. Defaults to nova-volumes.
# [use_syslog] Rather or not service should log to syslog. Optional.
# [use_stderr] Rather or not service should log to stderr. Optional.
# [syslog_log_facility] Facility for syslog, if used. Optional. Note: duplicating conf option
# wouldn't have been used, but more powerfull rsyslog features managed via conf template instead
# [ssh_private_key] path to private ssh key temporary location on this server where it was uploaded or generated
@ -119,6 +120,7 @@ class openstack::compute (
$cinder_iscsi_bind_addr = false,
$db_host = '127.0.0.1',
$use_syslog = false,
$use_stderr = true,
$syslog_log_facility = 'LOG_LOCAL6',
$syslog_log_facility_neutron = 'LOG_LOCAL4',
$syslog_log_facility_ceilometer = 'LOG_LOCAL0',
@ -257,6 +259,7 @@ class openstack::compute (
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
state_path => $state_path,
report_interval => $nova_report_interval,

3
deployment/puppet/openstack/manifests/controller.pp
View File

@ -48,6 +48,7 @@
# [enabled] Whether services should be enabled. This parameter can be used to
# implement services in active-passive modes for HA. Optional. Defaults to true.
# [use_syslog] Rather or not service should log to syslog. Optional. Defaults to false.
# [use_stderr] Rather or not service should log to stderr. Optional. Defaults to true.
# [syslog_log_facility] Facility for syslog, if used. Optional. Note: duplicating conf option
# wouldn't have been used, but more powerfull rsyslog features managed via conf template instead
# [max_retries] number of reconnects to Sqlalchemy db backend. Defaults -1.
@ -205,6 +206,7 @@ class openstack::controller (
$manage_volumes = false,
$nv_physical_volume = undef,
$use_syslog = false,
$use_stderr = true,
$syslog_log_facility_ceilometer = 'LOG_LOCAL0',
$syslog_log_facility_glance = 'LOG_LOCAL2',
$syslog_log_facility_cinder = 'LOG_LOCAL3',
@ -304,6 +306,7 @@ class openstack::controller (
enabled_apis => $enabled_apis,
api_bind_address => $api_bind_address,
ensure_package => $::openstack_version['nova'],
use_stderr => $use_stderr,
use_syslog => $use_syslog,
syslog_log_facility => $syslog_log_facility_nova,
syslog_log_facility_neutron => $syslog_log_facility_neutron,

4
deployment/puppet/openstack/manifests/glance.pp
View File

@ -24,6 +24,7 @@
# [enabled] Used to indicate if the service should be active (true) or passive (false).
# Optional. Defaults to true
# [use_syslog] Rather or not service should log to syslog. Optional. Default to false.
# [use_stderr] Rather or not service should send output to stderr. Optional. Defaults to true.
# [syslog_log_facility] Facility for syslog, if used. Optional. Note: duplicating conf option
# wouldn't have been used, but more powerfull rsyslog features managed via conf template instead
# [glance_image_cache_max_size] the maximum size of glance image cache. Optional. Default is 10G.
@ -62,6 +63,7 @@ class openstack::glance (
$debug = false,
$enabled = true,
$use_syslog = false,
$use_stderr = true,
$show_image_direct_url = true,
$swift_store_large_object_size = '5120',
$pipeline = 'keystone',
@ -117,6 +119,7 @@ class openstack::glance (
enabled => $enabled,
registry_host => $registry_host,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
database_idle_timeout => $idle_timeout,
show_image_direct_url => $show_image_direct_url,
@ -159,6 +162,7 @@ class openstack::glance (
database_connection => $sql_connection,
enabled => $enabled,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
database_idle_timeout => $idle_timeout,
}

4
deployment/puppet/openstack/manifests/heat.pp
View File

@ -1,5 +1,7 @@
#
#TODO(bogdando) sync extended qpid rpc backend configuration here as well
# [use_stderr] Rather or not service should send output to stderr. Optional. Defaults to true.
#
class openstack::heat (
$external_ip = '127.0.0.1',
@ -22,6 +24,7 @@ class openstack::heat (
$verbose = false,
$debug = false,
$use_syslog = false,
$use_stderr = true,
$syslog_log_facility = 'LOG_LOCAL0',
$log_dir = '/var/log/heat',
@ -145,6 +148,7 @@ class openstack::heat (
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
}

3
deployment/puppet/openstack/manifests/keystone.pp
View File

@ -22,6 +22,7 @@
# [enabled] If the service is active (true) or passive (false).
# Optional. Defaults to true
# [use_syslog] Rather or not service should log to syslog. Optional. Default to false.
# [use_stderr] Rather or not service should send output to stderr. Optional. Defaults to true.
# [syslog_log_facility] Facility for syslog, if used. Optional. Note: duplicating conf option
# wouldn't have been used, but more powerfull rsyslog features managed via conf template instead
# [max_pool_size] SQLAlchemy backend related. Default 10.
@ -62,6 +63,7 @@ class openstack::keystone (
$enabled = true,
$package_ensure = present,
$use_syslog = false,
$use_stderr = true,
$syslog_log_facility = 'LOG_LOCAL7',
$region = 'RegionOne',
$database_idle_timeout = '200',
@ -133,6 +135,7 @@ class openstack::keystone (
admin_bind_host => $admin_bind_host,
package_ensure => $package_ensure,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
database_idle_timeout => $database_idle_timeout,
rabbit_password => $rabbit_password,
rabbit_userid => $rabbit_userid,

5
deployment/puppet/openstack/manifests/logrotate.pp
View File

@ -28,6 +28,11 @@ class openstack::logrotate (
}
}
#Upstart logs are managed by fuel logrotate file
file { "/etc/logrotate.d/upstart":
ensure => absent,
}
# TODO(aschultz): should move these to augeas when augeas is upgraded to
# >=1.4.0 because maxsize isn't supported until 1.4.0 which breaks everything.
File_line {

8
deployment/puppet/openstack/manifests/network.pp
View File

@ -12,6 +12,10 @@
# (optional) Enabled or not ml2 plugin's l2population mechanism driver.
# Defaults to false
#
# [*use_stderr*]
# (optional) Rather or not service should send output to stderr.
# Defaults to true
#
class openstack::network (
# asdf = {} #Trick to color editor
$network_provider = 'neutron',
@ -20,7 +24,8 @@ class openstack::network (
$verbose = false,
$debug = false,
$use_syslog = flase,
$use_syslog = false,
$use_stderr = true,
$syslog_log_facility = 'LOG_USER',
# ovs
@ -152,6 +157,7 @@ class openstack::network (
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility,
bind_host => $bind_host,
base_mac => $base_mac,

2
deployment/puppet/openstack/manifests/nova/controller.pp
View File

@ -88,6 +88,7 @@ class openstack::nova::controller (
$enabled_apis = 'ec2,osapi_compute',
$api_bind_address = '0.0.0.0',
$use_syslog = false,
$use_stderr = true,
$syslog_log_facility = 'LOG_LOCAL6',
$syslog_log_facility_neutron = 'LOG_LOCAL4',
$nova_rate_limits = undef,
@ -235,6 +236,7 @@ class openstack::nova::controller (
ensure_package => $ensure_package,
log_facility => $syslog_log_facility,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
database_idle_timeout => $idle_timeout,
report_interval => $nova_report_interval,
service_down_time => $nova_service_down_time,

1
deployment/puppet/openstack/templates/10-fuel-docker.conf.erb
View File

@ -38,6 +38,7 @@
"/var/log/shotgun.log"
"/var/log/syslog"
"/var/log/user.log"
"/var/log/upstart/*.log"
{
# pass whole regexp to {pre,post}rotate scripts
sharedscripts

1
deployment/puppet/openstack/templates/10-fuel.conf.erb
View File

@ -27,6 +27,7 @@
"/var/log/sudo.log"
"/var/log/syslog"
"/var/log/user.log"
"/var/log/upstart/*.log"
{
# pass whole regexp to {pre,post}rotate scripts
sharedscripts

2
deployment/puppet/osnailyfacter/modular/ceilometer/compute.pp
View File

@ -3,6 +3,7 @@ notice('MODULAR: ceilometer/compute.pp')
$verbose = hiera('verbose', true)
$debug = hiera('debug', false)
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$syslog_log_facility = hiera('syslog_log_facility_ceilometer', 'LOG_LOCAL0')
$rabbit_hash = hiera_hash('rabbit_hash')
$management_vip = hiera('management_vip')
@ -32,6 +33,7 @@ if ($ceilometer_enabled) {
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
syslog_log_facility => $syslog_log_facility,
amqp_hosts => hiera('amqp_hosts',''),
amqp_user => $amqp_user,

2
deployment/puppet/osnailyfacter/modular/ceilometer/controller.pp
View File

@ -13,6 +13,7 @@ $default_ceilometer_hash = {
$verbose = hiera('verbose', true)
$debug = hiera('debug', false)
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$syslog_log_facility = hiera('syslog_log_facility_ceilometer', 'LOG_LOCAL0')
$nodes_hash = hiera('nodes')
$storage_hash = hiera('storage')
@ -81,6 +82,7 @@ if ($ceilometer_enabled) {
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
syslog_log_facility => $syslog_log_facility,
db_type => $ceilometer_db_type,
db_host => $mongo_hosts,

2
deployment/puppet/osnailyfacter/modular/glance/glance.pp
View File

@ -13,6 +13,7 @@ $service_endpoint = hiera('service_endpoint')
$glance_hash = hiera_hash('glance', {})
$storage_hash = hiera('storage')
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$syslog_log_facility = hiera('syslog_log_facility_glance')
$rabbit_hash = hiera_hash('rabbit_hash', {})
$max_pool_size = hiera('max_pool_size')
@ -92,6 +93,7 @@ class { 'openstack::glance':
glance_backend => $glance_backend,
registry_host => $glance_endpoint,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
show_image_direct_url => $glance_show_image_direct_url,
swift_store_large_object_size => $swift_store_large_object_size,
pipeline => $glance_pipeline,

2
deployment/puppet/osnailyfacter/modular/heat/heat.pp
View File

@ -11,6 +11,7 @@ $idle_timeout = hiera('idle_timeout')
$service_endpoint = hiera('service_endpoint')
$debug = hiera('debug', false)
$verbose = hiera('verbose', true)
$use_stderr = hiera('use_stderr', false)
$use_syslog = hiera('use_syslog', true)
$syslog_log_facility_heat = hiera('syslog_log_facility_heat')
$deployment_mode = hiera('deployment_mode')
@ -74,6 +75,7 @@ class { 'openstack::heat' :
debug => $debug,
verbose => $verbose,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
syslog_log_facility => $syslog_log_facility_heat,
auth_encryption_key => $heat_hash['auth_encryption_key'],
}

2
deployment/puppet/osnailyfacter/modular/keystone/keystone.pp
View File

@ -10,6 +10,7 @@ $verbose = hiera('verbose', true)
$debug = hiera('debug', false)
$use_neutron = hiera('use_neutron', false)
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$keystone_hash = hiera_hash('keystone', {})
$access_hash = hiera_hash('access',{})
$management_vip = hiera('management_vip')
@ -109,6 +110,7 @@ class { 'openstack::keystone':
admin_bind_host => $local_address_for_bind,
enabled => $enabled,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
syslog_log_facility => $syslog_log_facility,
region => $region,
memcache_servers => values($memcache_address_map),

2
deployment/puppet/osnailyfacter/modular/murano/murano.pp
View File

@ -18,6 +18,7 @@ $syslog_log_facility_murano = hiera('syslog_log_facility_murano')
$debug = hiera('debug', false)
$verbose = hiera('verbose', true)
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$rabbit_ha_queues = hiera('rabbit_ha_queues')
$amqp_port = hiera('amqp_port')
$amqp_hosts = hiera('amqp_hosts')
@ -76,6 +77,7 @@ if $murano_hash['enabled'] {
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
log_facility => $syslog_log_facility_murano,
database_connection => $sql_connection,
keystone_uri => "${public_protocol}://${public_address}:5000/v2.0/",

1
deployment/puppet/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp
View File

@ -79,6 +79,7 @@ class {'openstack::cinder':
identity_uri => $identity_uri,
cinder_user_password => $cinder_user_password,
use_syslog => hiera('use_syslog', true),
use_stderr => hiera('use_stderr', false),
verbose => hiera('verbose', true),
debug => hiera('debug', true),
syslog_log_facility => hiera('syslog_log_facility_cinder', 'LOG_LOCAL3'),

2
deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
View File

@ -10,6 +10,7 @@ $use_neutron = hiera('use_neutron', false)
$nova_report_interval = hiera('nova_report_interval')
$nova_service_down_time = hiera('nova_service_down_time')
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$syslog_log_facility_glance = hiera('syslog_log_facility_glance', 'LOG_LOCAL2')
$syslog_log_facility_neutron = hiera('syslog_log_facility_neutron', 'LOG_LOCAL4')
$syslog_log_facility_nova = hiera('syslog_log_facility_nova','LOG_LOCAL6')
@ -124,6 +125,7 @@ class { '::openstack::controller':
cinder => true,
ceilometer => $ceilometer_hash[enabled],
use_syslog => $use_syslog,
use_stderr => $use_stderr,
syslog_log_facility_nova => $syslog_log_facility_nova,
nova_rate_limits => $nova_rate_limits,
nova_report_interval => $nova_report_interval,

1
deployment/puppet/osnailyfacter/modular/openstack-network/openstack-network-compute.pp
View File

@ -385,6 +385,7 @@ class { 'openstack::network':
verbose => true,
debug => hiera('debug', true),
use_syslog => hiera('use_syslog', true),
use_stderr => hiera('use_stderr', false),
syslog_log_facility => hiera('syslog_log_facility_neutron', 'LOG_LOCAL4'),
# queue settings

1
deployment/puppet/osnailyfacter/modular/openstack-network/openstack-network-controller.pp
View File

@ -235,6 +235,7 @@ class { 'openstack::network':
verbose => true,
debug => hiera('debug', true),
use_syslog => hiera('use_syslog', true),
use_stderr => hiera('use_stderr', false),
syslog_log_facility => hiera('syslog_log_facility_neutron', 'LOG_LOCAL4'),
neutron_server => $neutron_server,

2
deployment/puppet/osnailyfacter/modular/roles/cinder.pp
View File

@ -29,6 +29,7 @@ $controllers = hiera('controllers')
$neutron_mellanox = hiera('neutron_mellanox', false)
$syslog_hash = hiera('syslog', {})
$base_syslog_hash = hiera('base_syslog', {})
$use_stderr = hiera('use_stderr', false)
$use_syslog = hiera('use_syslog', true)
$syslog_log_facility_glance = hiera('syslog_log_facility_glance', 'LOG_LOCAL2')
$syslog_log_facility_cinder = hiera('syslog_log_facility_cinder', 'LOG_LOCAL3')
@ -292,6 +293,7 @@ class { 'openstack::cinder':
syslog_log_facility => $syslog_log_facility_cinder,
debug => $debug,
verbose => $verbose,
use_stderr => $use_stderr,
use_syslog => $use_syslog,
max_retries => $max_retries,
max_pool_size => $max_pool_size,

2
deployment/puppet/osnailyfacter/modular/roles/compute.pp
View File

@ -41,6 +41,7 @@ $neutron_mellanox = hiera('neutron_mellanox', false)
$syslog_hash = hiera('syslog', {})
$base_syslog_hash = hiera('base_syslog', {})
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$syslog_log_facility_glance = hiera('syslog_log_facility_glance', 'LOG_LOCAL2')
$syslog_log_facility_cinder = hiera('syslog_log_facility_cinder', 'LOG_LOCAL3')
$syslog_log_facility_neutron = hiera('syslog_log_facility_neutron', 'LOG_LOCAL4')
@ -258,6 +259,7 @@ class { 'openstack::compute':
migration_support => true,
debug => $debug,
verbose => $verbose,
use_stderr => $use_stderr,
cinder_volume_group => "cinder",
vnc_enabled => true,
manage_volumes => $manage_volumes,

2
deployment/puppet/osnailyfacter/modular/sahara/sahara.pp
View File

@ -17,6 +17,7 @@ $syslog_log_facility_sahara = hiera('syslog_log_facility_sahara')
$debug = hiera('debug', false)
$verbose = hiera('verbose', true)
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$rabbit_ha_queues = hiera('rabbit_ha_queues')
$amqp_port = hiera('amqp_port')
$amqp_hosts = hiera('amqp_hosts')
@ -60,6 +61,7 @@ if $sahara_hash['enabled'] {
verbose => $verbose,
debug => $debug,
use_syslog => $use_syslog,
use_stderr => $use_stderr,
plugins => [ 'ambari', 'cdh', 'mapr', 'spark', 'vanilla' ],
log_facility => $syslog_log_facility_sahara,
database_connection => $sql_connection,

6
deployment/puppet/sahara/manifests/init.pp
View File

@ -20,6 +20,10 @@
# Use syslog for logging.
# (Optional) Defaults to false.
#
# [*use_stderr*]
# (optional) Log output to standard error
# Defaults to true
#
# [*log_facility*]
# Syslog facility to receive log lines.
# (Optional) Defaults to LOG_USER.
@ -263,6 +267,7 @@ class sahara(
$verbose = false,
$debug = false,
$use_syslog = false,
$use_stderr = true,
$log_facility = 'LOG_USER',
$log_dir = '/var/log/sahara',
$use_neutron = false,
@ -409,6 +414,7 @@ class sahara(
'DEFAULT/use_neutron': value => $use_neutron;
'DEFAULT/use_floating_ips': value => $use_floating_ips;
'DEFAULT/verbose': value => $verbose;
'DEFAULT/use_stderr': value => $use_stderr;
}
if $admin_password {

4
deployment/puppet/sahara/spec/classes/sahara_init_spec.rb
View File

@ -7,7 +7,8 @@ describe 'sahara' do
let :params do
{
:admin_password => 'secrete'
:admin_password => 'secrete',
:use_stderr => 'true'
}
end
@ -23,6 +24,7 @@ describe 'sahara' do
it { is_expected.to contain_sahara_config('DEFAULT/use_neutron').with_value('false') }
it { is_expected.to contain_sahara_config('DEFAULT/use_floating_ips').with_value('true') }
it { is_expected.to contain_sahara_config('DEFAULT/plugins').with_value('vanilla,hdp,spark,cdh') }
it { is_expected.to contain_sahara_config('DEFAULT/use_stderr').with_value('true') }
end
context 'with passing params' do

3
tests/noop/spec/hosts/ceilometer/compute_spec.rb
View File

@ -19,6 +19,9 @@ describe manifest do
it 'should configure timeout for HTTP requests' do
should contain_ceilometer_config('DEFAULT/http_timeout').with(:value => http_timeout)
end
it 'should disable use_stderr option' do
should contain_ceilometer_config('DEFAULT/use_stderr').with(:value => 'false')
end
end
end # end of shared_examples

1
tests/noop/spec/hosts/ceilometer/controller_spec.rb
View File

@ -20,6 +20,7 @@ describe manifest do
'amqp_password' => rabbit_password,
'rabbit_ha_queues' => rabbit_ha_queues,
'on_controller' => 'true',
'use_stderr' => 'false',
)
end
it 'should configure OS ENDPOINT TYPE for ceilometer' do

3
tests/noop/spec/hosts/glance/glance_spec.rb
View File

@ -12,6 +12,7 @@ describe manifest do
max_overflow = Noop.hiera('max_overflow')
max_retries = '-1'
use_syslog = Noop.hiera('use_syslog', 'true')
use_stderr = Noop.hiera('use_stderr', 'false')
region = Noop.hiera('region', 'RegionOne')
if glance_config && glance_config.has_key?('pipeline')
pipeline = glance_config['pipeline']
@ -27,6 +28,7 @@ describe manifest do
it 'should configure glance api config' do
should contain_glance_api_config('database/max_pool_size').with_value(max_pool_size)
should contain_glance_api_config('DEFAULT/use_stderr').with_value(use_stderr)
should contain_glance_api_config('database/max_overflow').with_value(max_overflow)
should contain_glance_api_config('database/max_retries').with_value(max_retries)
should contain_glance_api_config('DEFAULT/delayed_delete').with_value('False')
@ -50,6 +52,7 @@ describe manifest do
end
it 'should configure glance registry config' do
should contain_glance_registry_config('DEFAULT/use_stderr').with_value(use_stderr)
should contain_glance_registry_config('database/max_pool_size').with_value(max_pool_size)
should contain_glance_registry_config('database/max_overflow').with_value(max_overflow)
should contain_glance_registry_config('database/max_retries').with_value(max_retries)

4
tests/noop/spec/hosts/heat/heat_spec.rb
View File

@ -20,6 +20,10 @@ describe manifest do
should contain_heat_config('DEFAULT/use_syslog_rfc_format').with(:value => use_syslog)
end
it 'should disable use_stderr for heat' do
should contain_heat_config('DEFAULT/use_stderr').with(:value => 'false')
end
it 'should configure region name for heat' do
region = Noop.hiera 'region'
if !region

4
tests/noop/spec/hosts/keystone/keystone_spec.rb
View File

@ -132,6 +132,10 @@ describe manifest do
should contain_apache__listen('35357')
end
it 'should disable use_stderr for keystone' do
should contain_keystone_config('DEFAULT/use_stderr').with(:value => 'false')
end
if ceilometer_hash and ceilometer_hash['enabled']
it 'should configure notification driver' do
should contain_keystone_config('DEFAULT/notification_driver').with(:value => 'messagingv2')

1
tests/noop/spec/hosts/murano/murano_spec.rb
View File

@ -70,6 +70,7 @@ describe manifest do
'verbose' => verbose,
'debug' => debug,
'use_syslog' => use_syslog,
'use_stderr' => 'false',
'log_facility' => syslog_log_facility_murano,
'database_connection' => sql_connection,
'keystone_uri' => "#{public_protocol}://#{public_address}:5000/v2.0/",

4
tests/noop/spec/hosts/openstack-cinder/openstack-cinder_spec.rb
View File

@ -37,6 +37,10 @@ rabbit_ha_queues = Noop.hiera('rabbit_ha_queues')
should contain_cinder_config('DEFAULT/lock_path').with(:value => '/var/lock/cinder')
end
it 'ensures cinder_config contains use_stderr set to false' do
should contain_cinder_config('DEFAULT/use_stderr').with(:value => 'false')
end
end # end of shared_examples
test_ubuntu_and_centos manifest

6
tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
View File

@ -21,6 +21,12 @@ describe manifest do
# TODO All this stuff should be moved to shared examples controller* tests.
# Nova config options
it 'nova config should have use_stderr set to false' do
should contain_nova_config('DEFAULT/use_stderr').with(
'value' => 'false',
)
end
it 'nova config should have report_interval set to 60' do
should contain_nova_config('DEFAULT/report_interval').with(
'value' => '60',

6
tests/noop/spec/hosts/openstack-network/openstack-network-compute_spec.rb
View File

@ -10,6 +10,12 @@ describe manifest do
internal_address = Noop.node_hash['internal_address']
use_neutron = Noop.hiera 'use_neutron'
it 'should declare openstack::network with use_stderr disabled' do
should contain_class('openstack::network').with(
'use_stderr' => 'false',
)
end
# Network
if use_neutron
it 'should declare openstack::network with neutron_server parameter set to false' do

6
tests/noop/spec/hosts/openstack-network/openstack-network-controller_spec.rb
View File

@ -11,6 +11,12 @@ describe manifest do
ceilometer_enabled = Noop.hiera_structure 'ceilometer/enabled'
service_endpoint = Noop.hiera 'service_endpoint'
it 'should declare openstack::network with use_stderr disabled' do
should contain_class('openstack::network').with(
'use_stderr' => 'false',
)
end
# Network
if use_neutron
it 'should declare openstack::network with neutron enabled' do

4
tests/noop/spec/hosts/roles/cinder_spec.rb
View File

@ -22,6 +22,10 @@ describe manifest do
should contain_cinder_config('DEFAULT/auth_strategy').with(:value => 'keystone')
end
it 'should disable use_stderr option' do
should contain_cinder_config('DEFAULT/use_stderr').with(:value => 'false')
end
end
test_ubuntu_and_centos manifest
end

5
tests/noop/spec/hosts/roles/compute_spec.rb
View File

@ -53,6 +53,11 @@ describe manifest do
'value' => '180',
)
end
it 'nova config should have use_stderr set to false' do
should contain_nova_config('DEFAULT/use_stderr').with(
'value' => 'false',
)
end
end

1
tests/noop/spec/hosts/sahara/sahara_spec.rb
View File

@ -60,6 +60,7 @@ describe manifest do
'verbose' => verbose,
'debug' => debug,
'use_syslog' => use_syslog,
'use_stderr' => 'false',
'log_facility' => log_facility_sahara,
'database_connection' => sql_connection,
'admin_password' => sahara_password,