aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-27 08:24:24 +0000
committerGerrit Code Review <review@openstack.org>2016-09-27 08:24:24 +0000
commit38bc3e782affc09549ebb22a3e8eed3549397f28 (patch)
tree4d1966dc01527cde38ce2589ec54689569fedf98
parent91dd7cc6c771cb0a6d02936987f5f2737bd53f35 (diff)
parent3e0694ec1c84b201c44982cbca4e5f662f1b942d (diff)
Merge "Add metricd workers support in gnocchi"
-rw-r--r--environments/low-memory-usage.yaml1
-rw-r--r--puppet/services/gnocchi-metricd.yaml5
2 files changed, 6 insertions, 0 deletions
diff --git a/environments/low-memory-usage.yaml b/environments/low-memory-usage.yaml
index 2e496f89..ad428686 100644
--- a/environments/low-memory-usage.yaml
+++ b/environments/low-memory-usage.yaml
@@ -9,6 +9,7 @@ parameter_defaults:
NovaWorkers: 1
SaharaWorkers: 1
SwiftWorkers: 1
+ GnocchiMetricdWorkers: 1
ApacheMaxRequestWorkers: 32
ApacheServerLimit: 32
diff --git a/puppet/services/gnocchi-metricd.yaml b/puppet/services/gnocchi-metricd.yaml
index ebdebd1e..1400bc98 100644
--- a/puppet/services/gnocchi-metricd.yaml
+++ b/puppet/services/gnocchi-metricd.yaml
@@ -21,6 +21,10 @@ parameters:
MonitoringSubscriptionGnocchiMetricd:
default: 'overcloud-gnocchi-metricd'
type: string
+ GnocchiMetricdWorkers:
+ default: ''
+ description: Number of workers for Gnocchi MetricD
+ type: string
resources:
GnocchiServiceBase:
@@ -39,5 +43,6 @@ outputs:
config_settings:
map_merge:
- get_attr: [GnocchiServiceBase, role_data, config_settings]
+ - gnocchi::metricd::workers: {get_param: GnocchiMetricdWorkers}
step_config: |
include ::tripleo::profile::base::gnocchi::metricd