diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-10 17:20:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-10 17:20:09 +0000 |
| commit | 322f2dbd4c1d9c8617186bcb9211d7a1fe10ba3f (patch) | |
| tree | c0714854a4d02dfb8d74a2d48f5959ee89adf028 /docker/services/database/mongodb.yaml | |
| parent | 83defdbdbf12a4ba9d843cd115d1acb931d1d151 (diff) | |
| parent | cf18e865d14adc319b6c2dfafd650f32dad4d853 (diff) | |
Merge "Copy only generated puppet files into the container"
Diffstat (limited to 'docker/services/database/mongodb.yaml')
| -rw-r--r-- | docker/services/database/mongodb.yaml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml index 7b620c56..b5e7deab 100644 --- a/docker/services/database/mongodb.yaml +++ b/docker/services/database/mongodb.yaml @@ -76,6 +76,11 @@ 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: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true permissions: - path: /var/lib/mongodb owner: mongodb:mongodb @@ -94,8 +99,7 @@ outputs: 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/mongod.conf:/etc/mongod.conf:ro - - /var/lib/config-data/mongodb/etc/mongos.conf:/etc/mongos.conf:ro + - /var/lib/config-data/puppet-generated/mongodb/:/var/lib/kolla/config_files/src:ro - /etc/localtime:/etc/localtime:ro - /var/log/containers/mongodb:/var/log/mongodb - /var/lib/mongodb:/var/lib/mongodb |