Finish moving Keystone Auth from init.pp to api.pp

diff --git a/manifests/api.pp b/manifests/api.pp
index 2db8dd9b924ad03e7d0c94305fc2948f2cafbfb9..1751a38c7ad7c898bc7ae96390a91ad2231cee37 100644 (file)
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -4,9 +4,12 @@ class ceilometer::api(
   $keystone_port = '35357',
   $keystone_protocol = 'http',
   $keystone_user = 'ceilometer',
-  $keystone_password,
+  $keystone_password = undef,
 ) {
 
+
+  validate_string($keystone_password)
+
   package { 'ceilometer-api':
     ensure => installed
   }
@@ -18,11 +21,17 @@ class ceilometer::api(
   }
 
   service { 'ceilometer-api':
-    name       => $::ceilometer::params::api_service_name
-    enable      => $enabled,
+    name       => $::ceilometer::params::api_service_name,
+    enable     => $enabled,
     hasstatus  => true,
     hasrestart => true,
-    require => Package['ceilometer-api']
+    require    => Package['ceilometer-api']
+  }
+
+  ceilometer_setting {
+    'keystone_authtoken/auth_host': value => $keystone_host;
+    'keystone_authtoken/auth_port': value => $keystone_port;
+    'keystone_authtoken/protocol': value => $keystone_protocol;
   }
 
 }

diff --git a/manifests/init.pp b/manifests/init.pp
index c78e40fd92d28010db60f0bf8ac4a40e5bde4fa5..7bd19ccccc567c50d71a3668218bb85cf35f0b76 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -35,8 +35,8 @@ class ceilometer(
   }
 
   package { 'ceilometer-common':
-    name   => $::ceilometer::params::common_package_name,
     ensure => $package_ensure,
+    name   => $::ceilometer::params::common_package_name,
   }
 
   ceilometer_setting {
@@ -48,9 +48,6 @@ class ceilometer(
     '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;
   }