Move Settings to init.pp

diff --git a/manifests/agent-central.pp b/manifests/agent-central.pp
index 441684e0c580da6307b0cf2c5c9b28803e56cef6..6b83c65a17962ed587755cff556dc9dd7ee0c9d4 100644 (file)
--- a/manifests/agent-central.pp
+++ b/manifests/agent-central.pp
@@ -1,17 +1,4 @@
 class ceilometer::agent-central(
-  $keystone_password,
-  $verbose = 'False',
-  $debug = 'False',
-  $rabbit_host = '127.0.0.1',
-  $rabbit_port = 5672,
-  $rabbit_userid = 'guest',
-  $rabbit_password = '',
-  $rabbit_virtualhost = '/',
-  $database_connection = 'mysql://ceilometer:ceilometer@127.0.0.1/ceilometer',
-  $keystone_host = '127.0.0.1',
-  $keystone_port = '35357',
-  $keystone_protocol = 'http',
-  $keystone_user = 'ceilometer',
   $enabled = true,
 ) {
 
@@ -19,20 +6,6 @@ class ceilometer::agent-central(
     ensure => installed
   }
 
-  ceilometer_setting {
-    'DEFAULT/rabbit_host': value => $rabbit_host;
-    'DEFAULT/rabbit_port': value => $rabbit_port;
-    'DEFAULT/rabbit_userid': value => $rabbit_userid;
-    'DEFAULT/rabbit_password': value => $rabbit_password;
-    'DEFAULT/rabbit_virtualhost': value => $rabbit_virtualhost;
-    'DEFAULT/debug': value => $debug;
-    'DEFAULT/verbose': value => $verbose;
-    'DEFAULT/database_connection': value => $database_connection;
-    'keystone_authtoken/auth_host': value => $keystone_host;
-    'keystone_authtoken/auth_port': value => $keystone_port;
-    'keystone_authtoken/protocol': value => $keystone_protocol;
-  }
-
   file { ['/etc/ceilometer/ceilometer.conf']:
   }
 

diff --git a/manifests/api.pp b/manifests/api.pp
index 3123814028001699f66df1475f1af1fe34845ad0..28cec716ffc97ca0c1e4f18d0d821fb370bc90c8 100644 (file)
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -19,6 +19,15 @@ class ceilometer::api(
     ensure => installed
   }
 
+  file { ['/etc/ceilometer/ceilometer.conf']:
+  }
+
+  if $enabled {
+    $service_ensure = 'running'
+  } else {
+    $service_ensure = 'stopped'
+  }
+
   ceilometer_setting {
     'DEFAULT/rabbit_host': value => $rabbit_host;
     'DEFAULT/rabbit_port': value => $rabbit_port;
@@ -33,14 +42,6 @@ class ceilometer::api(
     'keystone_authtoken/protocol': value => $keystone_protocol;
   }
 
-  file { ['/etc/ceilometer/ceilometer.conf']:
-  }
-
-  if $enabled {
-    $service_ensure = 'running'
-  } else {
-    $service_ensure = 'stopped'
-  }
 
   service { 'ceilometer-api':
     name       => $::ceilometer::params::api_service_name

diff --git a/manifests/init.pp b/manifests/init.pp
index 3bf37750abc8df28c299a4f0d9379749ad0c4d0c..1be6847ceb371b7d9b9991f36f1a83e53d1f8694 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,6 +4,19 @@
 #
 class ceilometer(
   $package_ensure = 'present'
+  $keystone_password,
+  $verbose = 'False',
+  $debug = 'False',
+  $rabbit_host = '127.0.0.1',
+  $rabbit_port = 5672,
+  $rabbit_userid = 'guest',
+  $rabbit_password = '',
+  $rabbit_virtualhost = '/',
+  $database_connection = 'mysql://ceilometer:ceilometer@127.0.0.1/ceilometer',
+  $keystone_host = '127.0.0.1',
+  $keystone_port = '35357',
+  $keystone_protocol = 'http',
+  $keystone_user = 'ceilometer',
 ) {
 
   include ceilometer::params
@@ -21,5 +34,21 @@ class ceilometer(
     name   => $::ceilometer::params::common_package_name,
     ensure => $package_ensure,
   }
+
+  ceilometer_setting {
+    'DEFAULT/rabbit_host': value => $rabbit_host;
+    'DEFAULT/rabbit_port': value => $rabbit_port;
+    'DEFAULT/rabbit_userid': value => $rabbit_userid;
+    'DEFAULT/rabbit_password': value => $rabbit_password;
+    'DEFAULT/rabbit_virtualhost': value => $rabbit_virtualhost;
+    'DEFAULT/debug': value => $debug;
+    'DEFAULT/verbose': value => $verbose;
+    'DEFAULT/database_connection': value => $database_connection;
+    'keystone_authtoken/auth_host': value => $keystone_host;
+    'keystone_authtoken/auth_port': value => $keystone_port;
+    'keystone_authtoken/protocol': value => $keystone_protocol;
+  }
+
+
 }