aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/database/mysql.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-01 11:56:31 +0000
committerGerrit Code Review <review@openstack.org>2017-03-01 11:56:31 +0000
commitde1637bdd1f7753f8a20469697f98ef3ddaf4e2b (patch)
tree3cb9e9e8c7eb32f078f842c0f1a210f64358e42a /docker/services/database/mysql.yaml
parentd0d3403854c4afcfe07d51be23cd04c0aab96700 (diff)
parent93561bde0aaaa82d1ceacccb91ff8b623a9963cb (diff)
Merge "Switch to dict format for docker_puppet_tasks"
Diffstat (limited to 'docker/services/database/mysql.yaml')
-rw-r--r--docker/services/database/mysql.yaml16
1 files changed, 9 insertions, 7 deletions
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 2ef068d2..5809396e 100644
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -120,11 +120,13 @@ outputs:
docker_puppet_tasks:
# MySQL database initialization occurs only on single node
step_2:
- - 'mysql_init_tasks'
- - 'mysql_database,mysql_grant,mysql_user'
- - 'include ::tripleo::profile::base::database::mysql'
- - list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ]
- - - "mariadb:/var/lib/mysql/:ro"
+ 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} ]
+ volumes:
+ - "mariadb:/var/lib/mysql/:ro"
- "/var/lib/config-data/mysql/root:/root:ro" #provides .my.cnf