Merge "Upgrade scripts to migrate aodh alarm data"

[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 420cb4b..bb14546 100644 (file)
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@ -60,12 +60,16 @@ parameters:
         Rabbit client subscriber parameter to specify
         an SSL connection to the RabbitMQ host.
     type: string
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
 
 outputs:
   role_data:
     description: Role data for the Glance API role.
     value:
-      service_name: glance-api
+      service_name: glance_api
       config_settings:
         glance::api::database_connection:
           list_join:
@@ -85,6 +89,7 @@ outputs:
             params:
               REGISTRY_HOST: {get_param: [EndpointMap, GlanceRegistryInternal, host]}
         glance::api::keystone_password: {get_param: GlancePassword}
+        glance::api::enable_proxy_headers_parsing: true
         glance::api::debug: {get_param: Debug}
         glance::api::workers: {get_param: GlanceWorkers}
         glance_notifier_strategy: {get_param: GlanceNotifierStrategy}
@@ -105,6 +110,9 @@ outputs:
         glance::keystone::auth::internal_url: {get_param: [EndpointMap, GlanceInternal, uri]}
         glance::keystone::auth::admin_url: {get_param: [EndpointMap, GlanceAdmin, uri]}
         glance::keystone::auth::password: {get_param: GlancePassword }
+        glance::keystone::auth::region: {get_param: KeystoneRegion}
+        glance::registry::db::database_db_max_retries: -1
+        glance::registry::db::database_max_retries: -1
         tripleo.glance_api.firewall_rules:
           '112 glance_api':
             dport: