Agents, Api, Db & Collector classes inherit from ceilometer

diff --git a/manifests/agent/central.pp b/manifests/agent/central.pp
index 37deafddabaa824a741353e1ebd42d71c310d168..48440f77096355a5345b36264518ba023c4e080f 100644 (file)
--- a/manifests/agent/central.pp
+++ b/manifests/agent/central.pp
@@ -9,7 +9,7 @@ class ceilometer::agent::central(
   $auth_tenant_name = 'services',
   $auth_tenant_id   = '',
   $enabled          = true,
-) {
+) inherits ceilometer {
 
   package { 'ceilometer-agent-central':
     ensure => installed

diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
index c5cb1ac7b767279cd533af67b146fcd8948f53e5..589a940feaa2f17eaf350ac74bac38d7afb59b9d 100644 (file)
--- a/manifests/agent/compute.pp
+++ b/manifests/agent/compute.pp
@@ -9,7 +9,7 @@ class ceilometer::agent::compute(
   $auth_tenant_name = 'services',
   $auth_tenant_id   = '',
   $enabled          = true,
-) {
+) inherits ceilometer {
 
   package { 'ceilometer-agent-compute':
     ensure => installed

diff --git a/manifests/api.pp b/manifests/api.pp
index 10fcf675fc74d4198978190c94ce24af1a2d5488..94c45234853ef189b658cc97ccee354a7fff25f7 100644 (file)
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -8,7 +8,7 @@ class ceilometer::api(
   $keystone_protocol = 'http',
   $keystone_user     = 'ceilometer',
   $keystone_password = false,
-) {
+) inherits ceilometer {
 
   include 'ceilometer::params'
 

diff --git a/manifests/collector.pp b/manifests/collector.pp
index 9d6db0449ec69ecbba26432995290e05580b5846..c2e80d2d173b117dec48b375f7537818ba8dcd97 100644 (file)
--- a/manifests/collector.pp
+++ b/manifests/collector.pp
@@ -3,7 +3,7 @@
 #
 class ceilometer::collector(
   $enabled = true,
-) {
+) inherits ceilometer {
 
   include 'ceilometer::params'
 

diff --git a/manifests/db.pp b/manifests/db.pp
index aab43fea2580a8e7739e280dde1ac61e7bfc9f2a..40928bff938ed0c8a482308d1a68fa7748b73091 100644 (file)
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -3,7 +3,7 @@
 #
 class ceilometer::db (
   $database_connection = 'mysql://ceilometer:ceilometer@localhost/ceilometer'
-) {
+) inherits ceilometer {
 
   include 'ceilometer::params'