summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-21 21:21:11 +0000
committerGerrit Code Review <review@openstack.org>2016-09-21 21:21:11 +0000
commit2303d70d8083995a2e9960fe422d5f43c3cae617 (patch)
treeed529d62af3efafd7adc5d0a68106aba8691bd8f /puppet/services
parent9c605b3c4f84e87a279ae3d4367fa3c23c5c666c (diff)
parente6ecdb8b181eac9a7295b33c9691afe24f00640c (diff)
Merge "Glance worker count fix"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/glance-api.yaml13
-rw-r--r--puppet/services/glance-registry.yaml13
2 files changed, 20 insertions, 6 deletions
diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml
index f0ec8230..51f19baf 100644
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@ -45,9 +45,16 @@ parameters:
constraints:
- allowed_values: ['swift', 'file', 'rbd']
GlanceWorkers:
- default: 0
- description: Number of workers for Glance service.
- type: number
+ default: ''
+ description: |
+ Number of API worker processes for Glance. If left unset (empty string), the
+ default value will result in the configuration being left unset and a
+ system-dependent default value will be chosen (e.g.: number of
+ processors). Please note that this will create a large number of
+ processes on systems with a large number of CPUs resulting in excess
+ memory consumption. It is recommended that a suitable non-default value
+ be selected on such systems.
+ type: string
GlanceRbdPoolName:
default: images
type: string
diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml
index 864e970f..2b7b4345 100644
--- a/puppet/services/glance-registry.yaml
+++ b/puppet/services/glance-registry.yaml
@@ -27,9 +27,16 @@ parameters:
type: string
hidden: true
GlanceWorkers:
- default: 0
- description: Number of workers for Glance service.
- type: number
+ default: ''
+ description: |
+ Number of worker processes for glance registry. If left unset (empty
+ string), the default value will result in the configuration being left
+ unset and a system-dependent default value will be chosen (e.g.: number of
+ processors). Please note that this will create a large number of processes
+ on systems with a large number of CPUs resulting in excess memory
+ consumption. It is recommended that a suitable non-default value be
+ selected on such systems.
+ type: string
MonitoringSubscriptionGlanceRegistry:
default: 'overcloud-glance-registry'
type: string