Merge "docker-puppet: skip empty volume entries"

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

diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 36f3340..1579582 100644 (file)
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -100,13 +100,10 @@ outputs:
           config_volume: 'mongodb_init_tasks'
           puppet_tags: 'mongodb_database,mongodb_user,mongodb_replset'
           step_config: 'include ::tripleo::profile::base::database::mongodb'
-          config_image:
-            list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerMongodbImage} ]
+          config_image: *mongodb_image
           volumes:
-          - "mongodb:/var/lib/mongodb/"
-          - "logs:/var/log/kolla:ro"
+          - /var/lib/mongodb:/var/lib/mongodb
+          - logs:/var/log/kolla:ro
       host_prep_tasks:
         - name: create /var/lib/mongodb
           file: