Move settings to init.pp

diff --git a/manifests/agent-compute.pp b/manifests/agent-compute.pp
index 6ca17e008bba587f02854907d86f30f8819c035a..4811ce047c47f68b30955c2a70837ecc3ee38327 100644 (file)
--- a/manifests/agent-compute.pp
+++ b/manifests/agent-compute.pp
@@ -1,17 +1,4 @@
 class ceilometer::agent-compute(
-  $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,23 +6,6 @@ class ceilometer::agent-compute(
     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']:
-  }
-
   if $enabled {
     $service_ensure = 'running'
   } else {

diff --git a/manifests/api.pp b/manifests/api.pp
index 28cec716ffc97ca0c1e4f18d0d821fb370bc90c8..62748769f04b76ecc742b51ac0fb1c08bd43e8b5 100644 (file)
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -1,17 +1,4 @@
 class ceilometer::api(
-  $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,30 +6,12 @@ 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;
-    '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;
-  }
-
-
   service { 'ceilometer-api':
     name       => $::ceilometer::params::api_service_name
     enable      => $enabled,

diff --git a/manifests/collector.pp b/manifests/collector.pp
index c678ffe316bbb9506efe810ab1159635d27939df..b996862b6ad055b098874630de167676be87ae1c 100644 (file)
--- a/manifests/collector.pp
+++ b/manifests/collector.pp
@@ -1,17 +1,4 @@
 class ceilometer::collector(
-  $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,23 +6,6 @@ class ceilometer::collector(
     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']:
-  }
-
   if $enabled {
     $service_ensure = 'running'
   } else {