Merge "Use list_concat for metadata_settings for haproxy"

[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..7d2d1a1 100644 (file)
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -62,33 +62,19 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/mongodb.json:
           command: /usr/bin/mongod --unixSocketPrefix=/var/run/mongodb --config /etc/mongod.conf run
-          config_files:
-          - dest: /etc/mongod.conf
-            source: /var/lib/kolla/config_files/src/etc/mongod.conf
-            owner: mongodb
-            perm: '0600'
-          - dest: /etc/mongos.conf
-            source: /var/lib/kolla/config_files/src/etc/mongos.conf
-            owner: mongodb
-            perm: '0600'
+          permissions:
+            - path: /var/lib/mongodb
+              owner: mongodb:mongodb
+              recurse: true
       docker_config:
         step_2:
-          mongodb_data_ownership:
-            start_order: 0
-            image: *mongodb_image
-            net: host
-            user: root
-            command: ['chown', '-R', 'mongodb:', '/var/lib/mongodb']
-            volumes:
-              - /var/lib/mongodb:/var/lib/mongodb
           mongodb:
-            start_order: 1
             image: *mongodb_image
             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/:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/mongodb/etc/:/etc/:ro
               - /etc/localtime:/etc/localtime:ro
               - logs:/var/log/kolla
               - /var/lib/mongodb:/var/lib/mongodb
@@ -100,13 +86,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: