summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-09 17:46:38 +0000
committerGerrit Code Review <review@openstack.org>2017-06-09 17:46:38 +0000
commiteab0cd441ccce9521edea43fbc657bac18d06970 (patch)
tree34725304d43d4fb53cb1ae0c41a4ba19bdcd66f0
parent2f5f8fcb2bbd2b9299ac0097a210ba4939d30dc4 (diff)
parentb749a1e3c67e32e9330d65daf09853692a6a357a (diff)
Merge "Revert "Add support to configure Num of Storage sacks""
-rw-r--r--puppet/services/gnocchi-base.yaml10
-rw-r--r--releasenotes/notes/add-num-of-sacks-7bd6658474ddb14c.yaml3
2 files changed, 1 insertions, 12 deletions
diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml
index e6a172a0..f4067ef6 100644
--- a/puppet/services/gnocchi-base.yaml
+++ b/puppet/services/gnocchi-base.yaml
@@ -34,10 +34,6 @@ parameters:
default: 30
description: Delay between processing metrics.
type: number
- NumberOfStorageSacks:
- default: '128'
- description: Number of storage sacks to create.
- type: string
GnocchiPassword:
description: The password for the gnocchi service and db account.
type: string
@@ -91,11 +87,7 @@ outputs:
query:
read_default_file: /etc/my.cnf.d/tripleo.cnf
read_default_group: tripleo
- gnocchi::db::sync::extra_opts:
- list_join:
- - ' '
- - - '--num-storage-sacks'
- - {get_param: NumberOfStorageSacks}
+ gnocchi::db::sync::extra_opts: ''
gnocchi::storage::metric_processing_delay: {get_param: MetricProcessingDelay}
gnocchi::storage::swift::swift_user: 'service:gnocchi'
gnocchi::storage::swift::swift_auth_version: 3
diff --git a/releasenotes/notes/add-num-of-sacks-7bd6658474ddb14c.yaml b/releasenotes/notes/add-num-of-sacks-7bd6658474ddb14c.yaml
deleted file mode 100644
index e5adb6a9..00000000
--- a/releasenotes/notes/add-num-of-sacks-7bd6658474ddb14c.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-features:
- - Add support to configure number of sacks in gnocchi.