Convert EndpointMap to not require per-service VIP parameters

[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 50a0bfc..ca10fd1 100644 (file)
--- a/puppet/services/glance-registry.yaml
+++ b/puppet/services/glance-registry.yaml
@@ -26,7 +26,7 @@ outputs:
   role_data:
     description: Role data for the Glance Registry role.
     value:
-      service_name: glance-registry
+      service_name: glance_registry
       config_settings:
         glance::registry::database_connection:
           list_join:
@@ -45,11 +45,13 @@ outputs:
         glance::registry::debug: {get_param: Debug}
         glance::registry::workers: {get_param: GlanceWorkers}
         glance::db::mysql::user: glance
-        glance::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
+        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:
           '112 glance_registry':