Merge "Move neutron settings out of puppet/compute.yaml"

[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 b224cd6..c554bf9 100644 (file)
--- a/puppet/services/cinder-base.yaml
+++ b/puppet/services/cinder-base.yaml
@@ -58,12 +58,13 @@ outputs:
         cinder::rabbit_password: {get_param: RabbitPassword}
         cinder::rabbit_port: {get_param: RabbitClientPort}
         cinder::db::mysql::user: cinder
-        cinder::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
+        cinder::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
         cinder::db::mysql::dbname: cinder
         cinder::db::mysql::allowed_hosts:
           - '%'
           - "%{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