aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/database
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-21 09:46:11 +0000
committerGerrit Code Review <review@openstack.org>2017-03-21 09:46:11 +0000
commit76e34cfa2b252f314a06c27d75cfe2bc997206c2 (patch)
tree99150c348ee52cf061d13ac7e6071d94c6c7d994 /docker/services/database
parent430556b373b8611dad415528721e59f18b6f6f12 (diff)
parent1f018babcf4daca989758c2462b27e4137a9cd0f (diff)
Merge "Cleanup docker services templates"
Diffstat (limited to 'docker/services/database')
-rw-r--r--docker/services/database/mongodb.yaml5
-rw-r--r--docker/services/database/mysql.yaml5
2 files changed, 2 insertions, 8 deletions
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml
index 36f33403..265558a4 100644
--- a/docker/services/database/mongodb.yaml
+++ b/docker/services/database/mongodb.yaml
@@ -100,10 +100,7 @@ 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"
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 531c1ebd..0ffd0336 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -135,10 +135,7 @@ outputs:
config_volume: 'mysql_init_tasks'
puppet_tags: 'mysql_database,mysql_grant,mysql_user'
step_config: 'include ::tripleo::profile::base::database::mysql'
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ]
+ config_image: *mysql_image
volumes:
- "/var/lib/mysql:/var/lib/mysql/:ro"
- "/var/lib/config-data/mysql/root:/root:ro" #provides .my.cnf