diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-15 06:19:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-15 06:19:13 +0000 |
| commit | 2185b835602ffb276b8142db68d472611fdf127a (patch) | |
| tree | 50c351054ae33f3750e2a3a0a218432ddc6dcf02 /docker/services/database/mongodb.yaml | |
| parent | 07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (diff) | |
| parent | e76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c (diff) | |
Merge "Use a single configuration file for specifying docker containers."
Diffstat (limited to 'docker/services/database/mongodb.yaml')
| -rw-r--r-- | docker/services/database/mongodb.yaml | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml index 62e20094..5ba79b31 100644 --- a/docker/services/database/mongodb.yaml +++ b/docker/services/database/mongodb.yaml @@ -4,17 +4,11 @@ description: > MongoDB service deployment using puppet and docker parameters: - DockerNamespace: - description: namespace - default: 'tripleoupstream' - type: string DockerMongodbImage: 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: {} @@ -74,10 +68,7 @@ outputs: config_volume: mongodb puppet_tags: file # set this even though file is the default step_config: *step_config - config_image: &mongodb_config_image - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerMongodbConfigImage} ] + config_image: &mongodb_config_image {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 @@ -96,10 +87,7 @@ outputs: docker_config: step_2: mongodb: - image: - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerMongodbImage} ] + image: {get_param: DockerMongodbImage} net: host privileged: false volumes: &mongodb_volumes |