openstack
/
puppet-ceilometer
Code Issues Proposed changes

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

This commit is contained in:
François Charlier 2012-12-10 15:58:20 +01:00
parent faafa4257e
commit a29182c983
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/api.pp
View File

@ -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;
}
}

5
manifests/init.pp
View File

@ -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;
}