Remove inheritance from ceilometer

diff --git a/manifests/agent/central.pp b/manifests/agent/central.pp
index 48440f77096355a5345b36264518ba023c4e080f..d93b8d99bee1baf27e9a68aa121fc13e9ecb46ae 100644 (file)
--- a/manifests/agent/central.pp
+++ b/manifests/agent/central.pp
@@ -1,7 +1,5 @@
-# Ceilometer::Agent::Central
 #
-#
-class ceilometer::agent::central(
+class ceilometer::agent::central (
   $auth_url         = 'http://localhost:5000/v2.0',
   $auth_region      = 'RegionOne',
   $auth_user        = 'ceilometer',
@@ -9,7 +7,11 @@ class ceilometer::agent::central(
   $auth_tenant_name = 'services',
   $auth_tenant_id   = '',
   $enabled          = true,
-) inherits ceilometer {
+) {
+
+  include ceilometer::params
+
+  Package<| title == 'ceilometer-common' |> -> Class['ceilometer::agent::central']
 
   package { 'ceilometer-agent-central':
     ensure => installed

diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
index a2ccd833ec10b14d4ec25f3fc23dfe100655c322..78a1adef28dd36884b82c1b9ccbba116e76d9c88 100644 (file)
--- a/manifests/agent/compute.pp
+++ b/manifests/agent/compute.pp
@@ -1,7 +1,5 @@
-# Ceilometer::Agent::Compute
 #
-#
-class ceilometer::agent::compute(
+class ceilometer::agent::compute (
   $auth_url         = 'http://localhost:5000/v2.0',
   $auth_region      = 'RegionOne',
   $auth_user        = 'ceilometer',
@@ -9,7 +7,11 @@ class ceilometer::agent::compute(
   $auth_tenant_name = 'services',
   $auth_tenant_id   = '',
   $enabled          = true,
-) inherits ceilometer {
+) {
+
+  include ceilometer::params
+
+  Package<| title == 'ceilometer-common' |> -> Class['ceilometer::agent::compute']
 
   package { 'ceilometer-agent-compute':
     ensure => installed

diff --git a/manifests/api.pp b/manifests/api.pp
index 3bd551afcf58b5fdd402e303b9f8b6bb8e28fae3..f9f42558e64c6d5ae748c934e0b95068eea13812 100644 (file)
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -1,7 +1,5 @@
-# Ceilometer::Api class
 #
-#
-class ceilometer::api(
+class ceilometer::api (
   $enabled           = true,
   $keystone_host     = '127.0.0.1',
   $keystone_port     = '35357',
@@ -9,9 +7,11 @@ class ceilometer::api(
   $keystone_user     = 'ceilometer',
   $keystone_tenant   = 'services',
   $keystone_password = false,
-) inherits ceilometer {
+) {
+
+  include ceilometer::params
 
-  include 'ceilometer::params'
+  Package<| title == 'ceilometer-common' |> -> Class['ceilometer::api']
 
   validate_string($keystone_password)
 

diff --git a/manifests/client.pp b/manifests/client.pp
index b43ef8b227285c87031ca89d52f9e9aaed19f42b..83588a2e8ef100cf675441624e166fc29da2916e 100644 (file)
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -8,6 +8,8 @@ class ceilometer::client (
   $ensure = 'present'
 ) {
 
+  include ceilometer::params
+
   package { 'python-ceilometer':
     ensure => $ensure,
     name   => $::ceilometer::params::client_package_name,

diff --git a/manifests/collector.pp b/manifests/collector.pp
index c2e80d2d173b117dec48b375f7537818ba8dcd97..bd9228b9e7184c7a69ee232ea86a3cad01532ba7 100644 (file)
--- a/manifests/collector.pp
+++ b/manifests/collector.pp
@@ -1,11 +1,11 @@
-# Ceilometer::Collector class
 #
-#
-class ceilometer::collector(
+class ceilometer::collector (
   $enabled = true,
-) inherits ceilometer {
+) {
+
+  include ceilometer::params
 
-  include 'ceilometer::params'
+  Package<| title == 'ceilometer-common' |> -> Class['ceilometer::collector']
 
   package { 'ceilometer-collector':
     ensure => installed
@@ -28,5 +28,4 @@ class ceilometer::collector(
   }
 
   Ceilometer_config<||> ~> Service['ceilometer-collector']
-
 }

diff --git a/manifests/db.pp b/manifests/db.pp
index 124eca661fe63a461bf842018dd2f49778ddfeec..1d7627d58152a32cd75a41b66c1f391173b5ccca 100644 (file)
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -1,11 +1,11 @@
-# Ceilometer::Db::Settings class
-#
 #
 class ceilometer::db (
   $database_connection = 'mysql://ceilometer:ceilometer@localhost/ceilometer'
-) inherits ceilometer {
+) {
+
+  include ceilometer::params
 
-  include 'ceilometer::params'
+  Package<| title == 'ceilometer-common' |> -> Class['ceilometer::db']
 
   validate_re($database_connection,
     '(sqlite|mysql|posgres|mongodb):\/\/(\S+:\S+@\S+\/\S+)?')