X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fcinder-base.yaml;h=0db17189982bf71d5d656dd24efee7c011c68cec;hb=b61f1a33d55a23df7cd451679ee356d12c7f4a24;hp=f6d2b645fcaca8af6b1cb8b6de102625d33734db;hpb=c89f2e3f01e81e50d48e81a5d5727e62f1ffc178;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml
index f6d2b645..0db17189 100644
--- a/puppet/services/cinder-base.yaml
+++ b/puppet/services/cinder-base.yaml
@@ -12,6 +12,15 @@ parameters:
     default: ''
     description: Set to True to enable debugging on all services.
     type: string
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -40,6 +49,7 @@ outputs:
   role_data:
     description: Role data for the Cinder base service.
     value:
+      service_name: cinder_base
       config_settings:
         cinder::database_connection:
           list_join:
@@ -57,8 +67,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, MysqlInternal, 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::host: hostgroup
+        cinder::cron::db_purge::destination: '/dev/null'
+        cinder::db::database_db_max_retries: -1
+        cinder::db::database_max_retries: -1