diff options
author | 2017-03-06 10:32:52 +0000 | |
---|---|---|
committer | 2017-03-06 10:32:52 +0000 | |
commit | 47fcabee464b1e46490087316778b3cff0a55b5b (patch) | |
tree | f15d5fcafa2835131da9d13209930d98175cdfa9 /docker/services/database/mongodb.yaml | |
parent | ccb13e7b4227188275cb3f8e599fa8f6f37639c0 (diff) | |
parent | 610850140d605b18f4a28099f160fff1e489443d (diff) |
Merge "Put docker puppet config in puppet_config dict"
Diffstat (limited to 'docker/services/database/mongodb.yaml')
-rw-r--r-- | docker/services/database/mongodb.yaml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml index 127f8839..3c4146fd 100644 --- a/docker/services/database/mongodb.yaml +++ b/docker/services/database/mongodb.yaml @@ -45,7 +45,7 @@ outputs: map_merge: - get_attr: [MongodbPuppetBase, role_data, config_settings] - mongodb::server::fork: false - step_config: + step_config: &step_config list_join: - "\n" - - "['Mongodb_database', 'Mongodb_user', 'Mongodb_replset'].each |String $val| { noop_resource($val) }" @@ -56,9 +56,11 @@ outputs: list_join: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerMongodbImage} ] - puppet_tags: file # set this even though file is the default - config_volume: mongodb - config_image: *mongodb_image + puppet_config: + config_volume: mongodb + puppet_tags: file # set this even though file is the default + step_config: *step_config + config_image: *mongodb_image kolla_config: /var/lib/kolla/config_files/mongodb.json: command: /usr/bin/mongod --unixSocketPrefix=/var/run/mongodb --config /etc/mongod.conf run |