openstack
/
puppet-ceilometer
Code Issues Proposed changes

Refactoring/Style updates

This commit is contained in:
François Charlier 2012-12-10 16:53:39 +01:00
parent e2b0c7fca1
commit b240ef55ce
8 changed files with 60 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
manifests/agent-compute.pp
View File

@ -1,23 +0,0 @@
class ceilometer::agent-compute(
$enabled = true,
) {
package { 'ceilometer-agent-compute':
ensure => installed
}
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
service { 'ceilometer-agent-compute':
name => $::ceilometer::params::agent_compute_service_name
enable => $enabled,
hasstatus => true,
hasrestart => true,
require => Package['ceilometer-agent-compute']
}
}

11
manifests/agent-central.pp → manifests/agent/central.pp
View File

@ -1,4 +1,7 @@
class ceilometer::agent-central(
# Ceilometer::Agent::Central
#
#
class ceilometer::agent::central(
$enabled = true,
) {
@ -13,11 +16,11 @@ class ceilometer::agent-central(
}
service { 'ceilometer-agent-central':
name => $::ceilometer::params::agent_central_name
enable => $enabled,
name => $::ceilometer::params::agent_central_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
require => Package['ceilometer-agent-central']
require => Package['ceilometer-agent-central']
}
}

26
manifests/agent/compute.pp Normal file
View File

@ -0,0 +1,26 @@
# Ceilometer::Agent::Compute
#
#
class ceilometer::agent::compute(
$enabled = true,
) {
package { 'ceilometer-agent-compute':
ensure => installed
}
if $enabled {
$service_ensure = 'running'
} else {
$service_ensure = 'stopped'
}
service { 'ceilometer-agent-compute':
name => $::ceilometer::params::agent_compute_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
require => Package['ceilometer-agent-compute']
}
}

19
manifests/api.pp
View File

@ -1,13 +1,15 @@
# Ceilometer::Api class
#
#
class ceilometer::api(
$enabled = true,
$keystone_host = '127.0.0.1',
$keystone_port = '35357',
$enabled = true,
$keystone_host = '127.0.0.1',
$keystone_port = '35357',
$keystone_protocol = 'http',
$keystone_user = 'ceilometer',
$keystone_user = 'ceilometer',
$keystone_password = undef,
) {
validate_string($keystone_password)
package { 'ceilometer-api':
@ -31,9 +33,8 @@ class ceilometer::api(
Service['ceilometer-api'] -> Class['ceilometer::db']
ceilometer_setting {
'keystone_authtoken/auth_host': value => $keystone_host;
'keystone_authtoken/auth_port': value => $keystone_port;
'keystone_authtoken/protocol': value => $keystone_protocol;
'keystone_authtoken/auth_host' : value => $keystone_host;
'keystone_authtoken/auth_port' : value => $keystone_port;
'keystone_authtoken/protocol' : value => $keystone_protocol;
}
}

2
manifests/client.pp
View File

@ -9,8 +9,8 @@ class ceilometer::client (
) {
package { 'python-ceilometer':
name => $::ceilometer::params::client_package_name,
ensure => $ensure,
name => $::ceilometer::params::client_package_name,
}
}

9
manifests/collector.pp
View File

@ -1,3 +1,6 @@
# Ceilometer::Collector class
#
#
class ceilometer::collector(
$enabled = true,
) {
@ -13,11 +16,11 @@ class ceilometer::collector(
}
service { 'ceilometer-collector':
name => $::ceilometer::params::collector_service_name
enable => $enabled,
name => $::ceilometer::params::collector_service_name,
enable => $enabled,
hasstatus => true,
hasrestart => true,
require => Package['ceilometer-collector']
require => Package['ceilometer-collector']
}
Service['ceilometer-collector'] -> Class['ceilometer::db']

20
manifests/init.pp
View File

@ -3,21 +3,18 @@
# * package_ensure - ensure state for package.
#
class ceilometer(
$package_ensure = 'present',
$verbose = 'False',
$debug = 'False',
$rabbit_host = '127.0.0.1',
$rabbit_port = 5672,
$rabbit_userid = 'guest',
$rabbit_password = '',
$package_ensure = 'present',
$verbose = 'False',
$debug = 'False',
$rabbit_host = '127.0.0.1',
$rabbit_port = 5672,
$rabbit_userid = 'guest',
$rabbit_password = '',
$rabbit_virtualhost = '/',
$database_connection = 'mysql://ceilometer:ceilometer@127.0.0.1/ceilometer',
) {
include ceilometer::params
require 'mysql::python'
file { '/etc/ceilometer/':
ensure => directory,
owner => 'ceilometer',
@ -47,9 +44,6 @@ class ceilometer(
'DEFAULT/rabbit_virtualhost': value => $rabbit_virtualhost;
'DEFAULT/debug': value => $debug;
'DEFAULT/verbose': value => $verbose;
'DEFAULT/database_connection': value => $database_connection;
}
}

5
manifests/params.pp
View File

@ -1,5 +1,7 @@
# Ceilometer::Params class
#
#
class ceilometer::params {
$agent_central_package_name = 'ceilometer-agent-central'
$agent_compute_package_name = 'ceilometer-agent-compute'
$api_package_name = 'ceilometer-api'
@ -11,5 +13,4 @@ class ceilometer::params {
$agent_compute_service_name = 'ceilometer-agent-compute'
$api_service_name = 'ceilometer-api'
$collector_service_name = 'ceilometer-collector'
}