From: iberezovskiy <iberezovskiy@mirantis.com>
Date: Mon, 11 Jan 2016 16:28:01 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into mos-9.0
X-Git-Tag: 8.0.0-rc1^0
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F16017%2F2;p=puppet-modules%2Fpuppet-ceilometer.git

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

Change-Id: Ia7dc5ee1ab3df9022dca0771cd54bb8a236cba5a
---

3eae67c77b08ea976adb8b3729f976307be5ef16
diff --cc README.md
index b9cf4b2,6202557..ecd48e3
--- a/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',