From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Tue, 14 Jun 2016 15:17:12 +0000 (-0400)
Subject: Use create-legacy-resource-types during gnocchi-upgrade
X-Git-Tag: opnfv-6.0.0~1886^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=67cb6c703eaa986cbb2b9ca4cac4c9fa48c7ef60;p=apex-tripleo-heat-templates.git

Use create-legacy-resource-types during gnocchi-upgrade

Gnocchi 2.1 introduces a change where legacy resource types
needed by ceilometer are not created by default. Instead a
new flag is exposed to create these. We should use this by
default. Note that this is an optional flag and is only
needed if you want to create legacy resource types.

Change-Id: I95ccccb40ce4a8319d0776c4d62c2890cf1fd970
Closes-bug: #1592449
---

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 7db2b5de..97b5501c 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -4,7 +4,7 @@ nova::api::enabled: true
 nova::vncproxy::enabled: true
 
 # gnocchi
-gnocchi::db::sync::extra_opts: '--skip-storage'
+gnocchi::db::sync::extra_opts: '--skip-storage --create-legacy-resource-types'
 gnocchi::storage::swift::swift_user: 'service:gnocchi'
 gnocchi::storage::swift::swift_auth_version: 2
 gnocchi::statsd::resource_id: '0a8b55df-f90f-491c-8cb9-7cdecec6fc26'