Move Keystone Auth from init.pp to api.pp

diff --git a/manifests/api.pp b/manifests/api.pp
index 409d8237d15da15c9899e704856e9fa493e40494..2db8dd9b924ad03e7d0c94305fc2948f2cafbfb9 100644 (file)
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -1,5 +1,10 @@
 class ceilometer::api(
   $enabled = true,
+  $keystone_host = '127.0.0.1',
+  $keystone_port = '35357',
+  $keystone_protocol = 'http',
+  $keystone_user = 'ceilometer',
+  $keystone_password,
 ) {
 
   package { 'ceilometer-api':

diff --git a/manifests/init.pp b/manifests/init.pp
index 43611ed57ee37d458b6c1e10e16b8ebb1cdd2841..c78e40fd92d28010db60f0bf8ac4a40e5bde4fa5 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,7 +4,6 @@
 #
 class ceilometer(
   $package_ensure = 'present',
-  $keystone_password,
   $verbose = 'False',
   $debug = 'False',
   $rabbit_host = '127.0.0.1',
@@ -13,10 +12,6 @@ class ceilometer(
   $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