From b240ef55ce00fcce8c4e1503b777b6804b84e01d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Charlier?= Date: Mon, 10 Dec 2012 16:53:39 +0100 Subject: [PATCH] Refactoring/Style updates --- manifests/agent-compute.pp | 23 ---------------- .../{agent-central.pp => agent/central.pp} | 11 +++++--- manifests/agent/compute.pp | 26 +++++++++++++++++++ manifests/api.pp | 19 +++++++------- manifests/client.pp | 2 +- manifests/collector.pp | 9 ++++--- manifests/init.pp | 20 +++++--------- manifests/params.pp | 5 ++-- 8 files changed, 60 insertions(+), 55 deletions(-) delete mode 100644 manifests/agent-compute.pp rename manifests/{agent-central.pp => agent/central.pp} (57%) create mode 100644 manifests/agent/compute.pp diff --git a/manifests/agent-compute.pp b/manifests/agent-compute.pp deleted file mode 100644 index 7f2006d4..00000000 --- a/manifests/agent-compute.pp +++ /dev/null @@ -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'] - } - -} diff --git a/manifests/agent-central.pp b/manifests/agent/central.pp similarity index 57% rename from manifests/agent-central.pp rename to manifests/agent/central.pp index 96be3b6d..510f09de 100644 --- a/manifests/agent-central.pp +++ b/manifests/agent/central.pp @@ -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'] } } diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp new file mode 100644 index 00000000..dff5d986 --- /dev/null +++ b/manifests/agent/compute.pp @@ -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'] + } + +} diff --git a/manifests/api.pp b/manifests/api.pp index d5d37f28..a9372367 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -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; } - } diff --git a/manifests/client.pp b/manifests/client.pp index 921210d2..b43ef8b2 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -9,8 +9,8 @@ class ceilometer::client ( ) { package { 'python-ceilometer': - name => $::ceilometer::params::client_package_name, ensure => $ensure, + name => $::ceilometer::params::client_package_name, } } diff --git a/manifests/collector.pp b/manifests/collector.pp index 74ef3e25..edb6fecc 100644 --- a/manifests/collector.pp +++ b/manifests/collector.pp @@ -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'] diff --git a/manifests/init.pp b/manifests/init.pp index 7bd19ccc..390365c5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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; } - } - diff --git a/manifests/params.pp b/manifests/params.pp index fb9922d0..e68e31b3 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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' - }