summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-19 11:10:57 +0000
committerGerrit Code Review <review@openstack.org>2016-07-19 11:10:57 +0000
commit9da188033aa92c00e2c363fba29f25c4e5c73e09 (patch)
treefbe02b585dd19f720c3c945b50e748cd9d044755
parent46e85eaa013dc9fa5a3467f18021b346ac18a635 (diff)
parent95dd1ba91359bfdb141aa7ead16b789aafe2410e (diff)
Merge "gnocchi: configure db_sync command in the profile"
-rw-r--r--puppet/hieradata/controller.yaml1
-rw-r--r--puppet/services/gnocchi-base.yaml2
2 files changed, 1 insertions, 2 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 860c8fb5..94f57c8a 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -4,7 +4,6 @@ nova::api::enabled: true
nova::vncproxy::enabled: true
# gnocchi
-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'
diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml
index d4201032..44f3c3c7 100644
--- a/puppet/services/gnocchi-base.yaml
+++ b/puppet/services/gnocchi-base.yaml
@@ -55,7 +55,7 @@ outputs:
gnocchi::keystone::auth::tenant: 'service'
gnocchi::keystone::auth::password: {get_param: GnocchiPassword}
gnocchi::db::mysql::password: {get_param: GnocchiPassword}
- gnocchi::db::sync::extra_opts: '--skip-storage'
+ gnocchi::db::sync::extra_opts: '--skip-storage --create-legacy-resource-types'
#Gnocchi API
tripleo::profile::base::gnocchi::api::gnocchi_backend: {get_param: GnocchiBackend}
gnocchi::api::manage_service: false