]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/commitdiff
Fix puppet example in README
authorZhongShengping <chdzsp@163.com>
Sat, 21 Jan 2017 04:36:48 +0000 (12:36 +0800)
committerZhongShengping <chdzsp@163.com>
Sat, 21 Jan 2017 04:40:12 +0000 (12:40 +0800)
keystone_password is reomved in ceilometer::api, use password instead.
ceilometer::rabbit_host, ceilometer::rabbit_password,
ceilometer::rabbit_userid are deprecated. Use
ceilometer::default_transport_url instead

Change-Id: Iab2341f8e14193616768cdb1787031b89cfa158a

README.md

index 5f48e2d83f12f86bf2f5ac6508ae5968da4c3000..01be2e6c422a0d8ba881f034064cf48e997ab0fd 100644 (file)
--- a/README.md
+++ b/README.md
@@ -50,10 +50,11 @@ To utilize the ceilometer module's functionality you will need to declare multip
 
 ```puppet
 class { '::ceilometer':
-  telemetry_secret    => 'secrete',
-  rabbit_userid       => 'ceilometer',
-  rabbit_password     => 'an_even_bigger_secret',
-  rabbit_host         => '127.0.0.1',
+  telemetry_secret      => 'secrete',
+  default_transport_url => 'rabbit://ceilometer:an_even_bigger_secret@127.0.0.1:5672',
+}
+class { '::ceilometer::keystone::auth':
+  password => 'a_big_secret',
 }
 class { '::ceilometer::client': }
 class { '::ceilometer::collector': }
@@ -61,10 +62,12 @@ class { '::ceilometer::expirer': }
 class { '::ceilometer::agent::polling': }
 class { '::ceilometer::agent::notification': }
 class { '::ceilometer::db': }
+class { '::ceilometer::keystone::authtoken':
+  password => 'a_big_secret',
+  auth_url => 'http://127.0.0.1:35357/',
+}
 class { '::ceilometer::api':
-  enabled               => true,
-  keystone_password     => 'a_big_secret',
-  keystone_identity_uri => 'http://127.0.0.1:35357/',
+  enabled => true,
 }
 ```