stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #189 from enovance/enhancement/78/sbadia

Browse Source 
Consistent logging settings for all OpenStack components (syslog and LOCAL0)
This commit is contained in:
Gonéri Le Bouder 2014-02-10 17:31:23 +01:00
commit 554a98b6c1
24 changed files with 310 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/compute.pp
View File

@ -55,7 +55,14 @@
# (optional) Set log output to debug output
# Default value in params
#
# [*use_syslog*]
# (optional) Use syslog for logging
# Defaults value in params
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines
# Defaults value in params
#
class cloud::compute(
$nova_db_host = $os_params::nova_db_host,
$nova_db_user = $os_params::nova_db_user,
@ -65,7 +72,9 @@ class cloud::compute(
$ks_glance_internal_host = $os_params::ks_glance_internal_host,
$glance_api_port = $os_params::ks_glance_api_internal_port,
$verbose = $os_params::verbose,
$debug = $os_params::debug
$debug = $os_params::debug,
$use_syslog = $os_params::use_syslog,
$log_facility = $os_params::log_facility
) {
if !defined(Resource['nova_config']) {
@ -84,7 +93,9 @@ class cloud::compute(
rabbit_password => $rabbit_password,
glance_api_servers => "http://${ks_glance_internal_host}:${glance_api_port}",
verbose => $verbose,
debug => $debug
debug => $debug,
log_facility => $log_facility,
use_syslog => $use_syslog
}
nova_config {

17
manifests/identity.pp
View File

@ -315,7 +315,14 @@
# (optional) Set log output to debug output
# Default value in params
#
# [*use_syslog*]
# (optional) Use syslog for logging
# Defaults value in params
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines
# Defaults value in params
#
class cloud::identity (
$identity_roles_addons = $os_params::identity_roles_addons,
$keystone_db_host = $os_params::keystone_db_host,
@ -382,7 +389,9 @@ class cloud::identity (
$api_eth = $os_params::api_eth,
$region = $os_params::region,
$verbose = $os_params::verbose,
$debug = $os_params::debug
$debug = $os_params::debug,
$log_facility = $os_params::log_facility,
$use_syslog = $os_params::use_syslog
){
$encoded_user = uriescape($keystone_db_user)
@ -395,12 +404,12 @@ class cloud::identity (
compute_port => $ks_nova_public_port,
debug => $debug,
idle_timeout => 60,
log_facility => 'LOG_LOCAL0',
log_facility => $log_facility,
memcache_servers => $memcache_servers,
sql_connection => "mysql://${encoded_user}:${encoded_password}@${keystone_db_host}/keystone",
token_driver => 'keystone.token.backends.memcache.Token',
token_provider => 'keystone.token.providers.uuid.Provider',
use_syslog => true,
use_syslog => $use_syslog,
verbose => $verbose,
bind_host => $api_eth,
public_port => $ks_keystone_public_port,

21
manifests/image.pp
View File

@ -59,7 +59,14 @@
# (optional) Which interface we bind the Glance API server.
# Default value in params
#
# [*use_syslog*]
# (optional) Use syslog for logging
# Defaults value in params
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines
# Defaults value in params
#
class cloud::image(
$glance_db_host = $os_params::glance_db_host,
$glance_db_user = $os_params::glance_db_user,
@ -76,7 +83,9 @@ class cloud::image(
$rbd_store_pool = $os_params::glance_rbd_pool,
$rbd_store_user = $os_params::glance_rbd_user,
$verbose = $os_params::verbose,
$debug = $os_params::debug
$debug = $os_params::debug,
$log_facility = $os_params::log_facility,
$use_syslog = $os_params::use_syslog
) {
$encoded_glance_user = uriescape($glance_db_user)
@ -92,10 +101,10 @@ class cloud::image(
keystone_password => $ks_glance_password,
keystone_tenant => 'services',
keystone_user => 'glance',
log_facility => 'LOG_LOCAL0',
log_facility => $log_facility,
bind_host => $api_eth,
bind_port => $ks_glance_api_internal_port,
use_syslog => true
use_syslog => $use_syslog,
}
class { 'glance::registry':
@ -106,10 +115,10 @@ class cloud::image(
keystone_password => $ks_glance_password,
keystone_tenant => 'services',
keystone_user => 'glance',
log_facility => 'LOG_LOCAL0',
bind_host => $api_eth,
bind_port => $ks_glance_registry_internal_port,
use_syslog => true
use_syslog => $use_syslog,
log_facility => $log_facility,
}
class { 'glance::notify::rabbitmq':

15
manifests/network.pp
View File

@ -47,7 +47,14 @@
# (optionnal) Bridge mapping for provider networks
# Default value in params
#
# [*use_syslog*]
# (optional) Use syslog for logging
# Defaults value in params
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines
# Defaults value in params
#
class cloud::network(
$verbose = $os_params::verbose,
$debug = $os_params::debug,
@ -56,7 +63,9 @@ class cloud::network(
$tunnel_eth = $os_params::tunnel_eth,
$api_eth = $os_params::api_eth,
$provider_vlan_ranges = $os_params::provider_vlan_ranges,
$provider_bridge_mappings = $os_params::provider_bridge_mappings
$provider_bridge_mappings = $os_params::provider_bridge_mappings,
$use_syslog = $os_params::neutron_use_syslog,
$log_facility = $os_params::neutron_log_facility
) {
class { 'neutron':
@ -68,6 +77,8 @@ class cloud::network(
rabbit_password => $rabbit_password,
rabbit_virtual_host => '/',
bind_host => $api_eth,
log_facility => $log_facility,
use_syslog => $use_syslog,
dhcp_agents_per_network => '2',
core_plugin => 'neutron.plugins.ml2.plugin.Ml2Plugin',
service_plugins => ['neutron.services.loadbalancer.plugin.LoadBalancerPlugin','neutron.services.metering.metering_plugin.MeteringPlugin','neutron.services.l3_router.l3_router_plugin.L3RouterPlugin']

81
manifests/orchestration.pp
View File

@ -13,9 +13,84 @@
# License for the specific language governing permissions and limitations
# under the License.
#
# == Class: cloud::orchestration
#
# Orchestration common node
#
# === Parameters:
#
# [*ks_keystone_internal_host*]
# (optional) Internal Hostname or IP to connect to Keystone API
# Default value in params
#
# [*ks_keystone_admin_host*]
# (optional) Admin Hostname or IP to connect to Keystone API
# Default value in params
#
# [*ks_keystone_internal_port*]
# (optional) TCP port to connect to Keystone API from internal network
# Default value in params
#
# [*ks_keystone_admin_port*]
# (optional) TCP port to connect to Keystone API from admin network
# Default value in params
#
# [*ks_keystone_internal_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params
#
# [*ks_keystone_admin_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params
#
# [*ks_heat_public_host*]
# (optional) Public Hostname or IP to connect to Heat API
# Default value in params
#
# [*ks_heat_public_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params
#
# [*ks_heat_password*]
# (optional) Password used by Heat to connect to Keystone API
# Default value in params
#
# [*heat_db_host*]
# (optional) Hostname or IP address to connect to heat database
# Default value in params
#
# [*heat_db_user*]
# (optional) Username to connect to heat database
# Default value in params
#
# [*heat_db_password*]
# (optional) Password to connect to heat database
# Default value in params
#
# [*rabbit_hosts*]
# (optional) List of RabbitMQ servers. Should be an array.
# Default value in params
#
# [*rabbit_password*]
# (optional) Password to connect to heat queues.
# Default value in params
#
# [*verbose*]
# (optional) Set log output to verbose output
# Default value in params
#
# [*debug*]
# (optional) Set log output to debug output
# Default value in params
#
# [*use_syslog*]
# (optional) Use syslog for logging
# Defaults value in params
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines
# Defaults value in params
#
class cloud::orchestration(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$ks_keystone_internal_port = $os_params::ks_keystone_internal_port,
@ -33,6 +108,8 @@ class cloud::orchestration(
$rabbit_password = $os_params::rabbit_password,
$verbose = $os_params::verbose,
$debug = $os_params::debug,
$use_syslog = $os_params::use_syslog,
$log_facility = $os_params::log_facility
) {
$encoded_user = uriescape($heat_db_user)
@ -50,6 +127,8 @@ class cloud::orchestration(
rabbit_userid => 'heat',
verbose => $verbose,
debug => $debug,
log_facility => $log_facility,
use_syslog => $use_syslog,
}
# Note(EmilienM):

58
manifests/telemetry.pp
View File

@ -13,9 +13,57 @@
# License for the specific language governing permissions and limitations
# under the License.
#
# Used by Controller, Storage, Network and Compute nodes
# == Class: cloud::telemetry
#
# Common telemetry class, used by Controller, Storage,
# Network and Compute nodes
#
# === Parameters:
#
# [*ceilometer_secret*]
# Secret key for signing messages.
# Default value in params
#
# [*rabbit_hosts*]
# (optional) List of RabbitMQ servers. Should be an array.
# Default value in params
#
# [*rabbit_password*]
# (optional) Password to connect to nova queues.
# Default value in params
#
# [*ks_keystone_internal_host*]
# (optional) Internal Hostname or IP to connect to Keystone API
# Default value in params
#
# [*ks_keystone_admin_host*]
# (optional) Admin Hostname or IP to connect to Keystone API
# Default value in params
#
# [*ks_keystone_public_host*]
# (optional) Public Hostname or IP to connect to Keystone API
# Default value in params
#
# [*ks_ceilometer_password*]
# (optional) Password used by Ceilometer to connect to Keystone API
# Default value in params
#
# [*verbose*]
# (optional) Set log output to verbose output
# Default value in params
#
# [*debug*]
# (optional) Set log output to debug output
# Default value in params
#
# [*use_syslog*]
# (optional) Use syslog for logging
# Defaults value in params
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines
# Defaults value in params
#
class cloud::telemetry(
$ceilometer_secret = $os_params::ceilometer_secret,
$rabbit_hosts = $os_params::rabbit_hosts,
@ -26,6 +74,8 @@ class cloud::telemetry(
$ks_ceilometer_password = $os_params::ks_ceilometer_password,
$verbose = $os_params::verbose,
$debug = $os_params::debug,
$log_facility = $os_params::log_facility,
$use_syslog = $os_params::use_syslog,
){
class { 'ceilometer':
@ -35,8 +85,8 @@ class cloud::telemetry(
rabbit_userid => 'ceilometer',
verbose => $verbose,
debug => $debug,
use_syslog => true,
log_facility => 'LOG_LOCAL0'
use_syslog => $use_syslog,
log_facility => $log_facility
}
class { 'ceilometer::agent::auth':

58
manifests/volume.pp
View File

@ -13,9 +13,57 @@
# License for the specific language governing permissions and limitations
# under the License.
#
# Volume Common
#
# == Class: cloud::volume
#
# Common class for volume nodes
#
# === Parameters:
#
# [*cinder_db_host*]
# (optional) Cinder database host
# Default value in params
#
# [*cinder_db_user*]
# (optional) Cinder database user
# Default value in params
#
# [*cinder_db_password*]
# (optional) Cinder database password
# Default value in params
#
# [*rabbit_hosts*]
# (optional) List of RabbitMQ servers. Should be an array.
# Default value in params
#
# [*rabbit_password*]
# (optional) Password to connect to cinder queues.
# Default value in params
#
# [*ks_keystone_internal_host*]
# (optional) Keystone host (authentication)
# Default value in params
#
# [*ks_cinder_password*]
# (optional) Keystone password for cinder user.
# Default value in params
#
# [*verbose*]
# (optional) Set log output to verbose output
# Default value in params
#
# [*debug*]
# (optional) Set log output to debug output
# Default value in params
#
# [*use_syslog*]
# (optional) Use syslog for logging
# Defaults value in params
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines
# Defaults value in params
#
class cloud::volume(
$cinder_db_host = $os_params::cinder_db_host,
$cinder_db_user = $os_params::cinder_db_user,
@ -26,6 +74,8 @@ class cloud::volume(
$ks_cinder_password = $os_params::ks_cinder_password,
$verbose = $os_params::verbose,
$debug = $os_params::debug,
$log_facility = $os_params::log_facility,
$use_syslog = $os_params::use_syslog
) {
$encoded_user = uriescape($cinder_db_user)
@ -40,8 +90,8 @@ class cloud::volume(
rabbit_virtual_host => '/',
verbose => $verbose,
debug => $debug,
log_facility => 'LOG_LOCAL0',
use_syslog => true
log_facility => $log_facility,
use_syslog => $use_syslog
}
class { 'cinder::ceilometer': }

6
spec/classes/cloud_compute_controller_spec.rb
View File

@ -32,7 +32,9 @@ describe 'cloud::compute::controller' do
ks_glance_internal_host => '10.0.0.1',
glance_api_port => '9292',
verbose => true,
debug => true }"
debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end
let :params do
@ -50,6 +52,8 @@ describe 'cloud::compute::controller' do
should contain_class('nova').with(
:verbose => true,
:debug => true,
:use_syslog => true,
:log_facility => 'LOG_LOCAL0',
:rabbit_userid => 'nova',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',

6
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@ -32,7 +32,9 @@ describe 'cloud::compute::hypervisor' do
ks_glance_internal_host => '10.0.0.1',
glance_api_port => '9292',
verbose => true,
debug => true }"
debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end
let :params do
@ -49,6 +51,8 @@ describe 'cloud::compute::hypervisor' do
should contain_class('nova').with(
:verbose => true,
:debug => true,
:use_syslog => true,
:log_facility => 'LOG_LOCAL0',
:rabbit_userid => 'nova',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',

2
spec/classes/cloud_identity_spec.rb
View File

@ -86,6 +86,8 @@ describe 'cloud::identity' do
:region => 'BigCloud',
:verbose => true,
:debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:api_eth => '10.0.0.1' }
end

3
spec/classes/cloud_image_spec.rb
View File

@ -15,7 +15,6 @@
#
# Unit tests for cloud::image class
#
require 'spec_helper'
describe 'cloud::image' do
@ -38,6 +37,8 @@ describe 'cloud::image' do
:rbd_store_pool => 'images',
:debug => true,
:verbose => true,
:use_syslog => true,
:log_facility => 'LOG_LOCAL0',
:api_eth => '10.0.0.1' }
end

7
spec/classes/cloud_network_compute_spec.rb
View File

@ -15,7 +15,6 @@
#
# Unit tests for cloud::network::compute class
#
require 'spec_helper'
describe 'cloud::network::compute' do
@ -31,7 +30,9 @@ describe 'cloud::network::compute' do
provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true,
debug => true }"
debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end
let :params do
@ -47,6 +48,8 @@ describe 'cloud::network::compute' do
:dhcp_agents_per_network => '2',
:verbose => true,
:debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',

7
spec/classes/cloud_network_controller_spec.rb
View File

@ -15,7 +15,6 @@
#
# Unit tests for cloud::network::controller class
#
require 'spec_helper'
describe 'cloud::network::controller' do
@ -31,7 +30,9 @@ describe 'cloud::network::controller' do
provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true,
debug => true }"
debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end
let :params do
@ -50,6 +51,8 @@ describe 'cloud::network::controller' do
:dhcp_agents_per_network => '2',
:verbose => true,
:debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',

7
spec/classes/cloud_network_dhcp_spec.rb
View File

@ -15,7 +15,6 @@
#
# Unit tests for cloud::network::dhcp class
#
require 'spec_helper'
describe 'cloud::network::dhcp' do
@ -31,7 +30,9 @@ describe 'cloud::network::dhcp' do
provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true,
debug => true }"
debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end
let :params do
@ -44,6 +45,8 @@ describe 'cloud::network::dhcp' do
:dhcp_agents_per_network => '2',
:verbose => true,
:debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',

7
spec/classes/cloud_network_l3_spec.rb
View File

@ -15,7 +15,6 @@
#
# Unit tests for cloud::network::l3 class
#
require 'spec_helper'
describe 'cloud::network::l3' do
@ -31,7 +30,9 @@ describe 'cloud::network::l3' do
provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true,
debug => true }"
debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end
let :params do
@ -45,6 +46,8 @@ describe 'cloud::network::l3' do
:dhcp_agents_per_network => '2',
:verbose => true,
:debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',

7
spec/classes/cloud_network_lbaas_spec.rb
View File

@ -15,7 +15,6 @@
#
# Unit tests for cloud::network::lbaas class
#
require 'spec_helper'
describe 'cloud::network::lbaas' do
@ -31,7 +30,9 @@ describe 'cloud::network::lbaas' do
provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true,
debug => true }"
debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end
let :params do
@ -44,6 +45,8 @@ describe 'cloud::network::lbaas' do
:dhcp_agents_per_network => '2',
:verbose => true,
:debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',

7
spec/classes/cloud_network_metadata_spec.rb
View File

@ -15,7 +15,6 @@
#
# Unit tests for cloud::network::metadata class
#
require 'spec_helper'
describe 'cloud::network::metadata' do
@ -31,7 +30,9 @@ describe 'cloud::network::metadata' do
provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true,
debug => true }"
debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end
let :params do
@ -51,6 +52,8 @@ describe 'cloud::network::metadata' do
:dhcp_agents_per_network => '2',
:verbose => true,
:debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',

7
spec/classes/cloud_network_vpn_spec.rb
View File

@ -15,7 +15,6 @@
#
# Unit tests for cloud::network::vpnaas class
#
require 'spec_helper'
describe 'cloud::network::vpn' do
@ -31,7 +30,9 @@ describe 'cloud::network::vpn' do
provider_vlan_ranges => ['physnet1:1000:2999'],
provider_bridge_mappings => ['physnet1:br-eth1'],
verbose => true,
debug => true }"
debug => true,
use_syslog => true,
log_facility => 'LOG_LOCAL0' }"
end
it 'configure neutron common' do
@ -40,6 +41,8 @@ describe 'cloud::network::vpn' do
:dhcp_agents_per_network => '2',
:verbose => true,
:debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_user => 'neutron',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',

4
spec/classes/cloud_orchestration_api_spec.rb
View File

@ -39,6 +39,8 @@ describe 'cloud::orchestration::api' do
heat_db_user => 'heat',
heat_db_password => 'secrete',
verbose => true,
log_facility => 'LOG_LOCAL0',
use_syslog => true,
debug => true }"
end
@ -53,6 +55,8 @@ describe 'cloud::orchestration::api' do
should contain_class('heat').with(
:verbose => true,
:debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_userid => 'heat',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',

4
spec/classes/cloud_orchestration_engine_spec.rb
View File

@ -39,6 +39,8 @@ describe 'cloud::orchestration::engine' do
heat_db_user => 'heat',
heat_db_password => 'secrete',
verbose => true,
log_facility => 'LOG_LOCAL0',
use_syslog => true,
debug => true }"
end
@ -56,6 +58,8 @@ describe 'cloud::orchestration::engine' do
should contain_class('heat').with(
:verbose => true,
:debug => true,
:log_facility => 'LOG_LOCAL0',
:use_syslog => true,
:rabbit_userid => 'heat',
:rabbit_hosts => ['10.0.0.1'],
:rabbit_password => 'secrete',

2
spec/classes/cloud_telemetry_centralagent_spec.rb
View File

@ -31,6 +31,8 @@ describe 'cloud::telemetry::centralagent' do
ks_keystone_internal_port => '5000',
ks_keystone_internal_proto => 'http',
ks_ceilometer_password => 'secrete',
log_facility => 'LOG_LOCAL0',
use_syslog => true,
verbose => true,
debug => true }"
end

2
spec/classes/cloud_telemetry_server_spec.rb
View File

@ -31,6 +31,8 @@ describe 'cloud::telemetry::server' do
ks_keystone_internal_port => '5000',
ks_keystone_internal_proto => 'http',
ks_ceilometer_password => 'secrete',
log_facility => 'LOG_LOCAL0',
use_syslog => true,
verbose => true,
debug => true }"
end

4
spec/classes/cloud_volume_controller_spec.rb
View File

@ -32,7 +32,9 @@ describe 'cloud::volume::controller' do
ks_keystone_internal_host => '10.0.0.1',
ks_cinder_password => 'secrete',
verbose => true,
debug => true }"
debug => true,
log_facility => 'LOG_LOCAL0',
use_syslog => true }"
end
let :params do

4
spec/classes/cloud_volume_storage_spec.rb
View File

@ -32,7 +32,9 @@ describe 'cloud::volume::storage' do
ks_keystone_internal_host => '10.0.0.1',
ks_cinder_password => 'secrete',
verbose => true,
debug => true }"
debug => true,
log_facility => 'LOG_LOCAL0',
use_syslog => true }"
end
let :params do