Merge "SSH known_hosts config"

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

diff --git a/puppet/services/database/mongodb-base.yaml b/puppet/services/database/mongodb-base.yaml
index ecd1d31..c27fcb7 100644 (file)
--- a/puppet/services/database/mongodb-base.yaml
+++ b/puppet/services/database/mongodb-base.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   Configuration details for MongoDB service using composable roles
@@ -15,6 +15,20 @@ parameters:
   MongoDbReplset:
     type: string
     default: "tripleo"
+  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
+                 via parameter_defaults in the resource registry.
+    type: json
 
 outputs:
   aux_parameters:
@@ -24,7 +38,9 @@ outputs:
   role_data:
     description: Role data for the MongoDB base service.
     value:
+      service_name: mongodb_base
       config_settings:
         mongodb::server::nojournal: {get_param: MongoDbNoJournal}
+        mongodb::server::journal: false
         mongodb::server::ipv6: {get_param: MongoDbIPv6}
-        mongodb::server::replset: {get_param: MongoDbReplset}
\ No newline at end of file
+        mongodb::server::replset: {get_param: MongoDbReplset}