Fix dependencies and various typos

diff --git a/manifests/agent/central.pp b/manifests/agent/central.pp
index d93b8d99bee1baf27e9a68aa121fc13e9ecb46ae..477e42c668804539910e76fd49e938f2e67d3432 100644 (file)
--- a/manifests/agent/central.pp
+++ b/manifests/agent/central.pp
@@ -11,10 +11,12 @@ class ceilometer::agent::central (
 
   include ceilometer::params
 
-  Package<| title == 'ceilometer-common' |> -> Class['ceilometer::agent::central']
+  Ceilometer_config<||> ~> Service['ceilometer-agent-central']
 
+  Package['ceilometer-agent-central'] -> Service['ceilometer-agent-central']
   package { 'ceilometer-agent-central':
-    ensure => installed
+    ensure => installed,
+    name   => $::ceilometer::params::agent_central_package_name,
   }
 
   if $enabled {
@@ -23,17 +25,15 @@ class ceilometer::agent::central (
     $service_ensure = 'stopped'
   }
 
+  Package['ceilometer-common'] -> Service['ceilometer-agent-central']
   service { 'ceilometer-agent-central':
     ensure     => $service_ensure,
-    name       => $::ceilometer::params::agent_central_name,
+    name       => $::ceilometer::params::agent_central_service_name,
     enable     => $enabled,
     hasstatus  => true,
     hasrestart => true,
-    require    => Package['ceilometer-agent-central']
   }
 
-  Ceilometer_config<||> ~> Service['ceilometer-agent-central']
-
   ceilometer_config {
     'DEFAULT/os_auth_url'         : value => $auth_url;
     'DEFAULT/os_auth_region'      : value => $auth_region;

diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
index 78a1adef28dd36884b82c1b9ccbba116e76d9c88..b614492ba2f0011f2ddaf87f5560c389e6fa2efb 100644 (file)
--- a/manifests/agent/compute.pp
+++ b/manifests/agent/compute.pp
@@ -11,10 +11,12 @@ class ceilometer::agent::compute (
 
   include ceilometer::params
 
-  Package<| title == 'ceilometer-common' |> -> Class['ceilometer::agent::compute']
+  Ceilometer_config<||> ~> Service['ceilometer-agent-compute']
 
+  Package['ceilometer-agent-compute'] -> Service['ceilometer-agent-compute']
   package { 'ceilometer-agent-compute':
-    ensure => installed
+    ensure => installed,
+    name   => $::ceilometer::params::agent_compute_package_name,
   }
 
   User['ceilometer'] {
@@ -27,17 +29,15 @@ class ceilometer::agent::compute (
     $service_ensure = 'stopped'
   }
 
+  Package['ceilometer-common'] -> Service['ceilometer-agent-central']
   service { 'ceilometer-agent-compute':
     ensure     => $service_ensure,
     name       => $::ceilometer::params::agent_compute_service_name,
     enable     => $enabled,
     hasstatus  => true,
     hasrestart => true,
-    require    => Package['ceilometer-agent-compute']
   }
 
-  Ceilometer_config<||> ~> Service['ceilometer-agent-compute']
-
   ceilometer_config {
     'DEFAULT/os_auth_url'         : value => $auth_url;
     'DEFAULT/os_auth_region'      : value => $auth_region;

diff --git a/manifests/api.pp b/manifests/api.pp
index f9f42558e64c6d5ae748c934e0b95068eea13812..5136d1886add044c2cce868127ed0b82e9f3c490 100644 (file)
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -11,10 +11,12 @@ class ceilometer::api (
 
   include ceilometer::params
 
-  Package<| title == 'ceilometer-common' |> -> Class['ceilometer::api']
-
   validate_string($keystone_password)
 
+  Ceilometer_config<||> ~> Service['ceilometer-api']
+
+  Package['ceilometer-api'] -> Ceilometer_config<||>
+  Package['ceilometer-api'] -> Service['ceilometer-api']
   package { 'ceilometer-api':
     ensure => installed,
     name   => $::ceilometer::params::api_package_name,
@@ -26,18 +28,17 @@ class ceilometer::api (
     $service_ensure = 'stopped'
   }
 
+  Package['ceilometer-common'] -> Service['ceilometer-api']
   service { 'ceilometer-api':
     ensure     => $service_ensure,
     name       => $::ceilometer::params::api_service_name,
     enable     => $enabled,
     hasstatus  => true,
     hasrestart => true,
-    require    => [Package['ceilometer-api'], Class['ceilometer::db']],
+    require    => Class['ceilometer::db'],
     subscribe  => Exec['ceilometer-dbsync']
   }
 
-  Ceilometer_config<||> ~> Service['ceilometer-api']
-
   ceilometer_config {
     'keystone_authtoken/auth_host'         : value => $keystone_host;
     'keystone_authtoken/auth_port'         : value => $keystone_port;

diff --git a/manifests/collector.pp b/manifests/collector.pp
index 60193d4d43db9873795dd643911ec35aaaf4095c..b94bed104f0550f692b61685d856e0bba9169671 100644 (file)
--- a/manifests/collector.pp
+++ b/manifests/collector.pp
@@ -5,8 +5,9 @@ class ceilometer::collector (
 
   include ceilometer::params
 
-  Package<| title == 'ceilometer-common' |> -> Class['ceilometer::collector']
+  Ceilometer_config<||> ~> Service['ceilometer-collector']
 
+  Package['ceilometer-collector'] -> Service['ceilometer-collector']
   package { 'ceilometer-collector':
     ensure => installed,
     name   => $::ceilometer::params::collector_package_name,
@@ -18,15 +19,14 @@ class ceilometer::collector (
     $service_ensure = 'stopped'
   }
 
+  Package['ceilometer-common'] -> Service['ceilometer-collector']
   service { 'ceilometer-collector':
     ensure     => $service_ensure,
     name       => $::ceilometer::params::collector_service_name,
     enable     => $enabled,
     hasstatus  => true,
     hasrestart => true,
-    require    => [Package['ceilometer-collector'], Class['ceilometer::db']],
+    require    => Class['ceilometer::db'],
     subscribe  => Exec['ceilometer-dbsync']
   }
-
-  Ceilometer_config<||> ~> Service['ceilometer-collector']
 }

diff --git a/spec/classes/ceilometer_api_spec.rb b/spec/classes/ceilometer_api_spec.rb
index 9cee327749798d6b24948a87c75d50191382ac84..c50a3afe5514715dbbe4988e978c6784bd35ed43 100644 (file)
--- a/spec/classes/ceilometer_api_spec.rb
+++ b/spec/classes/ceilometer_api_spec.rb
@@ -35,7 +35,7 @@ describe 'ceilometer::api' do
         :enable     => true,
         :hasstatus  => true,
         :hasrestart => true,
-        :require    => ['Package[ceilometer-api]', 'Class[Ceilometer::Db]'],
+        :require    => 'Class[Ceilometer::Db]',
         :subscribe  => 'Exec[ceilometer-dbsync]'
       )
     end

diff --git a/spec/classes/ceilometer_collector_spec.rb b/spec/classes/ceilometer_collector_spec.rb
index f6c912595f8de932893570a5145407ea04c2f50f..421b36deac5cb69fdfb04ec38eb4a5a066d03d14 100644 (file)
--- a/spec/classes/ceilometer_collector_spec.rb
+++ b/spec/classes/ceilometer_collector_spec.rb
@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe 'ceilometer::collector' do
 
+  let :pre_condition do
+    "class { 'ceilometer': metering_secret => 's3cr3t' }"
+  end
+
   shared_examples_for 'ceilometer-collector' do
 
     it { should include_class('ceilometer::params') }
@@ -20,7 +24,7 @@ describe 'ceilometer::collector' do
         :enable     => true,
         :hasstatus  => true,
         :hasrestart => true,
-        :require    => ['Package[ceilometer-collector]', 'Class[Ceilometer::Db]'],
+        :require    => 'Class[Ceilometer::Db]',
         :subscribe  => 'Exec[ceilometer-dbsync]'
       )
     end