From: Mathieu Gagné <mgagne@iweb.com>
Date: Thu, 4 Apr 2013 23:51:49 +0000 (-0400)
Subject: Remove inheritance from ceilometer
X-Git-Tag: grizzly-eol~15^2~9^2~13
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a530fe11004b5878ac5a8a977c7fae0623b68042;p=puppet-modules%2Fpuppet-ceilometer.git

Remove inheritance from ceilometer
---

diff --git a/manifests/agent/central.pp b/manifests/agent/central.pp
index 48440f7..d93b8d9 100644
--- 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 a2ccd83..78a1ade 100644
--- 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 3bd551a..f9f4255 100644
--- 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 b43ef8b..83588a2 100644
--- 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 c2e80d2..bd9228b 100644
--- 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 124eca6..1d7627d 100644
--- 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+)?')