Merge "Add option to specify Certmonger CA"

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

diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml
index 864e970..30df67f 100644 (file)
--- 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
@@ -65,12 +72,6 @@ outputs:
         glance::registry::authtoken::auth_url: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
         glance::registry::debug: {get_param: Debug}
         glance::registry::workers: {get_param: GlanceWorkers}
-        glance::db::mysql::user: glance
-        glance::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
-        glance::db::mysql::dbname: glance
-        glance::db::mysql::allowed_hosts:
-          - '%'
-          - "%{hiera('mysql_bind_host')}"
         glance::registry::db::database_db_max_retries: -1
         glance::registry::db::database_max_retries: -1
         tripleo.glance_registry.firewall_rules:
@@ -86,3 +87,12 @@ outputs:
         glance::registry::bind_host: {get_param: [ServiceNetMap, GlanceRegistryNetwork]}
       step_config: |
         include ::tripleo::profile::base::glance::registry
+      service_config_settings:
+        mysql:
+          glance::db::mysql::password: {get_param: GlancePassword}
+          glance::db::mysql::user: glance
+          glance::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+          glance::db::mysql::dbname: glance
+          glance::db::mysql::allowed_hosts:
+            - '%'
+            - "%{hiera('mysql_bind_host')}"