Add in the class

diff --git a/manifests/agent-central.pp b/manifests/agent-central.pp
index d60e40f290f9b630d4289b17f4f58316b0b0211e..bec8b14a61dbf61df154eae328aca3ca637ba537 100644 (file)
--- a/manifests/agent-central.pp
+++ b/manifests/agent-central.pp
@@ -1,4 +1,4 @@
-class ceilometer::collector(
+class ceilometer::agent-central(
   $keystone_password,
   $verbose = 'False',
   $debug = 'False',
@@ -12,9 +12,10 @@ class ceilometer::collector(
   $keystone_port = '35357',
   $keystone_protocol = 'http',
   $keystone_user = 'ceilometer',
+  $enabled = true,
 ) {
 
-  package { 'ceilometer-collector':
+  package { 'ceilometer-agent-central':
     ensure => installed
   }
 
@@ -41,8 +42,8 @@ class ceilometer::collector(
     $service_ensure = 'stopped'
   }
 
-  service { 'ceilometer-collector':
-    name       => $::ceilometer::params::collector_package_name
+  service { 'ceilometer-agent-central':
+    name       => $::ceilometer::params::agent_central_package_name
     enable      => $enabled,
     hasstatus  => true,
     hasrestart => true,

diff --git a/manifests/agent-compute.pp b/manifests/agent-compute.pp
index 8018998421b82a7b7368b03990bd3dd79c5ce28a..a1af5568089c14666eab9832a7ec39c5310a22c1 100644 (file)
--- a/manifests/agent-compute.pp
+++ b/manifests/agent-compute.pp
@@ -12,6 +12,7 @@ class ceilometer::agent-compute(
   $keystone_port = '35357',
   $keystone_protocol = 'http',
   $keystone_user = 'ceilometer',
+  $enabled = true,
 ) {
 
   package { 'ceilometer-agent-compute':
@@ -42,7 +43,7 @@ class ceilometer::agent-compute(
   }
 
   service { 'ceilometer-agent-compute':
-    name       => $::ceilometer::params::agent-compute_package_name
+    name       => $::ceilometer::params::agent_compute_package_name
     enable      => $enabled,
     hasstatus  => true,
     hasrestart => true,

diff --git a/manifests/api.pp b/manifests/api.pp
index e0e20b8f2ba8cdc83a47c990fbd257f7004f5e80..cdff77495f414f608098dc9f1b5fa377aa398bfb 100644 (file)
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -12,6 +12,7 @@ class ceilometer::api(
   $keystone_port = '35357',
   $keystone_protocol = 'http',
   $keystone_user = 'ceilometer',
+  $enabled = true,
 ) {
 
   package { 'ceilometer-api':

diff --git a/manifests/collector.pp b/manifests/collector.pp
index d60e40f290f9b630d4289b17f4f58316b0b0211e..c548c0b853e69ebd469f1aafd2cd0b2ec15ed4aa 100644 (file)
--- a/manifests/collector.pp
+++ b/manifests/collector.pp
@@ -12,6 +12,7 @@ class ceilometer::collector(
   $keystone_port = '35357',
   $keystone_protocol = 'http',
   $keystone_user = 'ceilometer',
+  $enabled = true,
 ) {
 
   package { 'ceilometer-collector':