summaryrefslogtreecommitdiffstats
path: root/docker/services/database/mysql-client.yaml
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-06-23 18:21:43 +0200
committerMartin André <m.andre@redhat.com>2017-06-28 10:48:53 +0200
commita474ae82d5f157a48c997fb9df420442bd79dcbe (patch)
tree567735ea0e9dbd668b908740dc4526e99ef5a289 /docker/services/database/mysql-client.yaml
parent8c41b702f5b1c7baf2f2160b92067bcc0267c958 (diff)
Add heat parameter for all of config_volume images
This commit consistently defines a heat template parameter in the form of DockerXXXConfigImage where XXX represents the name of the config_volume that is used by docker-puppet. The goal is to mitigate hard to debug errors where the templates would set different defaults for the image docker-puppet.py uses to run, for the same config_volume name. This fixes a couple of inconsistencies on the way. Change-Id: I212020a76622a03521385a6cae4ce73e51ce5b6b Closes-Bug: #1699791
Diffstat (limited to 'docker/services/database/mysql-client.yaml')
-rw-r--r--docker/services/database/mysql-client.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/services/database/mysql-client.yaml b/docker/services/database/mysql-client.yaml
index b0ad3760..38a31e24 100644
--- a/docker/services/database/mysql-client.yaml
+++ b/docker/services/database/mysql-client.yaml
@@ -8,8 +8,8 @@ parameters:
description: namespace
default: 'tripleoupstream'
type: string
- DockerMysqlImage:
- description: image
+ DockerMysqlClientConfigImage:
+ description: The container image to use for the mysql_client config_volume
default: 'centos-binary-mariadb:latest'
type: string
ServiceNetMap:
@@ -61,6 +61,6 @@ outputs:
config_image:
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerMysqlClientConfigImage} ]
# no need for a docker config, this service only generates configuration files
docker_config: {}