Merge remote-tracking branch 'origin/master' into mos-9.0

Change-Id: Ia7dc5ee1ab3df9022dca0771cd54bb8a236cba5a

diff --cc README.md
index b9cf4b29851e579eba143aecb05e7cb433859c4a,6202557346c49be498ad5c2dc735a2a9ff350c3d..ecd48e370d5f081c2b5a14648e2d21980641224e
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -62,6 -57,6 +57,7 @@@ class { '::ceilometer::alarm::evaluator
  class { '::ceilometer::alarm::notifier': }
  class { '::ceilometer::agent::central': }
  class { '::ceilometer::agent::notification': }
++class { '::ceilometer::db': }
  class { '::ceilometer::api':
    enabled               => true,
    keystone_password     => 'a_big_secret',