X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fdatabase%2Fmongodb.yaml;h=7b620c56c7f23879a9f3059d283bceeae2fd99a0;hb=b87d4e1a1245dc1be512e0c7c38e052fff0c5b8b;hp=96a02f9f820c5f2e56d48c8c6002936ea446dbcb;hpb=2cd3c412bf850c087564bcaf652d2c3dce77cab3;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 96a02f9f..7b620c56 100644
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -12,6 +12,10 @@ parameters:
     description: image
     default: 'centos-binary-mongodb:latest'
     type: string
+  DockerMongodbConfigImage:
+    description: The container image to use for the mongodb config_volume
+    default: 'centos-binary-mongodb:latest'
+    type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -65,10 +69,10 @@ outputs:
         config_volume: mongodb
         puppet_tags: file # set this even though file is the default
         step_config: *step_config
-        config_image: &mongodb_image
+        config_image: &mongodb_config_image
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMongodbImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerMongodbConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/mongodb.json:
           command: /usr/bin/mongod --unixSocketPrefix=/var/run/mongodb --config /etc/mongod.conf run
@@ -82,12 +86,16 @@ outputs:
       docker_config:
         step_2:
           mongodb:
-            image: *mongodb_image
+            image:
+              list_join:
+                - '/'
+                - [ {get_param: DockerNamespace}, {get_param: DockerMongodbImage} ]
             net: host
             privileged: false
             volumes: &mongodb_volumes
               - /var/lib/kolla/config_files/mongodb.json:/var/lib/kolla/config_files/config.json
-              - /var/lib/config-data/mongodb/etc/:/etc/:ro
+              - /var/lib/config-data/mongodb/etc/mongod.conf:/etc/mongod.conf:ro
+              - /var/lib/config-data/mongodb/etc/mongos.conf:/etc/mongos.conf:ro
               - /etc/localtime:/etc/localtime:ro
               - /var/log/containers/mongodb:/var/log/mongodb
               - /var/lib/mongodb:/var/lib/mongodb
@@ -99,7 +107,7 @@ outputs:
           config_volume: 'mongodb_init_tasks'
           puppet_tags: 'mongodb_database,mongodb_user,mongodb_replset'
           step_config: 'include ::tripleo::profile::base::database::mongodb'
-          config_image: *mongodb_image
+          config_image: *mongodb_config_image
           volumes:
             - /var/lib/mongodb:/var/lib/mongodb
             - /var/log/containers/mongodb:/var/log/mongodb