]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commitdiff
Merge "policy.json: Allow one to manage them from the puppet module"
authorJenkins <jenkins@review.openstack.org>
Sun, 9 Nov 2014 11:23:58 +0000 (11:23 +0000)
committerGerrit Code Review <review@openstack.org>
Sun, 9 Nov 2014 11:23:58 +0000 (11:23 +0000)
1  2 
manifests/api.pp
spec/classes/ceilometer_api_spec.rb

index 0b8333806d39df77d6b71f8567149bc98b7a42c1,d66e665e7d6aae4d5081ead8de13c3f3c9cee80a..c3789cb04121f5fb0fea52c1391a53ecb3bd96c3
@@@ -76,8 -73,9 +78,9 @@@ class ceilometer::api 
  
    Package['ceilometer-api'] -> Ceilometer_config<||>
    Package['ceilometer-api'] -> Service['ceilometer-api']
+   Package['ceilometer-api'] -> Class['ceilometer::policy']
    package { 'ceilometer-api':
 -    ensure => installed,
 +    ensure => $package_ensure,
      name   => $::ceilometer::params::api_package_name,
    }
  
Simple merge