Move gnocchi's kestone::auth parameters to API profile

[apex-tripleo-heat-templates.git] / puppet / services / cinder-base.yaml

diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml
index c312690..f5d98af 100644 (file)
--- a/puppet/services/cinder-base.yaml
+++ b/puppet/services/cinder-base.yaml
@@ -40,7 +40,7 @@ outputs:
   role_data:
     description: Role data for the Cinder base service.
     value:
-      service_name: cinder-base
+      service_name: cinder_base
       config_settings:
         cinder::database_connection:
           list_join:
@@ -64,6 +64,7 @@ outputs:
           - '%'
           - "%{hiera('mysql_bind_host')}"
         cinder::rabbit_heartbeat_timeout_threshold: 60
-        cinder::keystone::auth::tenant: 'service'
         cinder::host: hostgroup
         cinder::cron::db_purge::destination: '/dev/null'
+        cinder::db::database_db_max_retries: -1
+        cinder::db::database_max_retries: -1