diff options
| author |   Martin André <m.andre@redhat.com> | 2017-03-09 16:48:06 +0100 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2017-03-10 08:37:23 +0100 |
| commit | 1f018babcf4daca989758c2462b27e4137a9cd0f (patch) | |
| tree | 101be75fef5770b917acdf4e240904ef9f3ad906 /docker/services/database | |
| parent | 97d891ea481493ada64a6ad4d1d99578119f109e (diff) | |
Cleanup docker services templates
Use yaml anchors wherever possible for image definition and drop unused
anchors.
Renamed parameters to Docker*ConfigImage to clarify that an image is
specifically used to generate configuration files.
Change-Id: I388bd59de7f1d36a3a881fbb723ba5bcba09e637
Diffstat (limited to 'docker/services/database')
| -rw-r--r-- | docker/services/database/mongodb.yaml | 5 | ||||
| -rw-r--r-- | docker/services/database/mysql.yaml | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml index 68a64a7d..fa2e52fa 100644 --- a/docker/services/database/mongodb.yaml +++ b/docker/services/database/mongodb.yaml @@ -91,10 +91,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 46b856e3..fe45c467 100644 --- a/docker/services/database/mysql.yaml +++ b/docker/services/database/mysql.yaml @@ -123,10 +123,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: - "mariadb:/var/lib/mysql/:ro" - "/var/lib/config-data/mysql/root:/root:ro" #provides .my.cnf |