diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-06 10:32:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-06 10:32:52 +0000 |
| commit | 47fcabee464b1e46490087316778b3cff0a55b5b (patch) | |
| tree | f15d5fcafa2835131da9d13209930d98175cdfa9 /docker/services/database/mysql.yaml | |
| parent | ccb13e7b4227188275cb3f8e599fa8f6f37639c0 (diff) | |
| parent | 610850140d605b18f4a28099f160fff1e489443d (diff) | |
Merge "Put docker puppet config in puppet_config dict"
Diffstat (limited to 'docker/services/database/mysql.yaml')
| -rw-r--r-- | docker/services/database/mysql.yaml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml index 5809396e..fd92e99c 100644 --- a/docker/services/database/mysql.yaml +++ b/docker/services/database/mysql.yaml @@ -54,7 +54,7 @@ outputs: pid-file: /var/lib/mysql/mariadb.pid mysqld_safe: pid-file: /var/lib/mysql/mariadb.pid - step_config: + step_config: &step_config list_join: - "\n" - - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }" @@ -65,9 +65,11 @@ outputs: list_join: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ] - puppet_tags: file # set this even though file is the default - config_volume: mysql - config_image: *mysql_image + puppet_config: + config_volume: mysql + puppet_tags: file # set this even though file is the default + step_config: *step_config + config_image: *mysql_image kolla_config: /var/lib/kolla/config_files/mysql.json: command: /usr/bin/mysqld_safe |