From 7eaaa97cf3bae6c4557e0b24a0c1e675f68098df Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Fri, 27 Oct 2017 17:53:57 +0200
Subject: [PATCH] Remove --skip-metering-database when calling
 ceilometer-upgrade

This command-line parameter has been removed upstream in [1], so
we have to remove it from the manifests.

[1] - https://review.openstack.org/512700

Change-Id: Ib86972dc4205375433895765a458854e35e3bac5
---
 packstack/puppet/modules/packstack/manifests/ceilometer.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packstack/puppet/modules/packstack/manifests/ceilometer.pp b/packstack/puppet/modules/packstack/manifests/ceilometer.pp
index 67f47a852..1601dd5cf 100644
--- a/packstack/puppet/modules/packstack/manifests/ceilometer.pp
+++ b/packstack/puppet/modules/packstack/manifests/ceilometer.pp
@@ -22,7 +22,7 @@ class packstack::ceilometer ()
     include ::ceilometer
 
     exec {'ceilometer-db-upgrade':
-      command   => 'ceilometer-upgrade --skip-metering-database',
+      command   => 'ceilometer-upgrade',
       path      => ['/usr/bin', '/usr/sbin'],
       try_sleep => 10,
       tries     => 20