From: emilienm <emilien.macchi@enovance.com>
Date: Fri, 7 Dec 2012 13:42:33 +0000 (+0100)
Subject: Add  in the class
X-Git-Tag: grizzly-eol~77
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=32b2f5faabdc985b3f44d0f7bc78fd03a831b54a;p=puppet-modules%2Fpuppet-ceilometer.git

Add  in the class
---

diff --git a/manifests/agent-central.pp b/manifests/agent-central.pp
index d60e40f..bec8b14 100644
--- 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 8018998..a1af556 100644
--- 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 e0e20b8..cdff774 100644
--- 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 d60e40f..c548c0b 100644
--- 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':