X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fdatabase%2Fmysql.yaml;h=cba2070df3e89d7eaccd0fe3321aba5b319ea548;hb=48e1b90594f6cb0d91fc6eb2c989de1a043c0ee5;hp=531c1ebdb1bb9bf802e23b8f42d6f436b5f05645;hpb=40573e9c9a07b2bd49b212b043052dec8b9a9016;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml
index 531c1ebd..cba2070d 100644
--- 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
-          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:
-          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:
-            start_order: 1
+            start_order: 0
             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
-              - /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
@@ -122,7 +107,7 @@ outputs:
                             - {get_param: MysqlRootPassword}
                             - {get_param: [DefaultPasswords, mysql_root_password]}
           mysql:
-            start_order: 2
+            start_order: 1
             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_image:
-            list_join:
-              - '/'
-              - [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ]
+          config_image: *mysql_image
           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: