Glance worker count fix

[apex-tripleo-heat-templates.git] / puppet / services / glance-api.yaml

diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml
index 94f9b9a..51f19ba 100644 (file)
--- 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
@@ -73,12 +80,24 @@ parameters:
     type: string
     default: 'regionOne'
     description: Keystone region for endpoint
+  MonitoringSubscriptionGlanceApi:
+    default: 'overcloud-glance-api'
+    type: string
+  GlanceApiLoggingSource:
+    type: json
+    default:
+      tag: openstack.glance.api
+      path: /var/log/glance/api.log
 
 outputs:
   role_data:
     description: Role data for the Glance API role.
     value:
       service_name: glance_api
+      monitoring_subscription: {get_param: MonitoringSubscriptionGlanceApi}
+      logging_source: {get_param: GlanceApiLoggingSource}
+      logging_groups:
+        - glance
       config_settings:
         glance::api::database_connection:
           list_join:
@@ -97,6 +116,7 @@ outputs:
             template: "'REGISTRY_HOST'"
             params:
               REGISTRY_HOST: {get_param: [EndpointMap, GlanceRegistryInternal, host]}
+        glance::api::registry_client_protocol: {get_param: [EndpointMap, GlanceRegistryInternal, protocol] }
         glance::api::authtoken::password: {get_param: GlancePassword}
         glance::api::enable_proxy_headers_parsing: true
         glance::api::debug: {get_param: Debug}