Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "aodh-base.yaml uses a hard coded keystone region name"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
database
/
mysql.yaml
diff --git
a/docker/services/database/mysql.yaml
b/docker/services/database/mysql.yaml
index
531c1eb
..
cba2070
100644
(file)
--- a/
docker/services/database/mysql.yaml
+++ b/
docker/services/database/mysql.yaml
@@
-71,29
+71,14
@@
outputs:
kolla_config:
/var/lib/kolla/config_files/mysql.json:
command: /usr/bin/mysqld_safe
kolla_config:
/var/lib/kolla/config_files/mysql.json:
command: /usr/bin/mysqld_safe
- config_files:
- - dest: /etc/mysql/my.cnf
- source: /var/lib/kolla/config_files/src/etc/my.cnf
- owner: mysql
- perm: '0644'
- - dest: /etc/my.cnf.d/galera.cnf
- source: /var/lib/kolla/config_files/src/etc/my.cnf.d/galera.cnf
- owner: mysql
- perm: '0644'
+ permissions:
+ - path: /var/lib/mysql
+ owner: mysql:mysql
+ recurse: true
docker_config:
step_2:
docker_config:
step_2:
- mysql_data_ownership:
- start_order: 0
- detach: false
- image: *mysql_image
- net: host
- user: root
- # Kolla does only non-recursive chown
- command: ['chown', '-R', 'mysql:', '/var/lib/mysql']
- volumes:
- - /var/lib/mysql:/var/lib/mysql
mysql_bootstrap:
mysql_bootstrap:
- start_order:
1
+ start_order:
0
detach: false
image: *mysql_image
net: host
detach: false
image: *mysql_image
net: host
@@
-101,7
+86,7
@@
outputs:
command: ['bash', '-c', 'test -e /var/lib/mysql/mysql || kolla_start']
volumes: &mysql_volumes
- /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json
command: ['bash', '-c', 'test -e /var/lib/mysql/mysql || kolla_start']
volumes: &mysql_volumes
- /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json
- - /var/lib/config-data/mysql/
:/var/lib/kolla/config_files/src
:ro
+ - /var/lib/config-data/mysql/
etc/:/etc/
:ro
- /etc/localtime:/etc/localtime:ro
- /etc/hosts:/etc/hosts:ro
- /var/lib/mysql:/var/lib/mysql
- /etc/localtime:/etc/localtime:ro
- /etc/hosts:/etc/hosts:ro
- /var/lib/mysql:/var/lib/mysql
@@
-122,7
+107,7
@@
outputs:
- {get_param: MysqlRootPassword}
- {get_param: [DefaultPasswords, mysql_root_password]}
mysql:
- {get_param: MysqlRootPassword}
- {get_param: [DefaultPasswords, mysql_root_password]}
mysql:
- start_order:
2
+ start_order:
1
image: *mysql_image
restart: always
net: host
image: *mysql_image
restart: always
net: host
@@
-135,13
+120,10
@@
outputs:
config_volume: 'mysql_init_tasks'
puppet_tags: 'mysql_database,mysql_grant,mysql_user'
step_config: 'include ::tripleo::profile::base::database::mysql'
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:
volumes:
- -
"/var/lib/mysql:/var/lib/mysql/:ro"
- -
"/var/lib/config-data/mysql/root:/root:ro"
#provides .my.cnf
+ -
/var/lib/mysql:/var/lib/mysql/:ro
+ -
/var/lib/config-data/mysql/root:/root:ro
#provides .my.cnf
host_prep_tasks:
- name: create /var/lib/mysql
file:
host_prep_tasks:
- name: create /var/lib/mysql
file: