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 c34ebe9..cba2070 100644 (file)
--- a/docker/services/database/mysql.yaml
+++ b/docker/services/database/mysql.yaml
@@ -60,27 +60,21 @@ outputs:
           - - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
             - {get_attr: [MysqlPuppetBase, role_data, step_config]}
       # BEGIN DOCKER SETTINGS #
-      docker_image: &mysql_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ]
       puppet_config:
         config_volume: mysql
         puppet_tags: file # set this even though file is the default
         step_config: *step_config
-        config_image: *mysql_image
+        config_image: &mysql_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerMysqlImage} ]
       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_bootstrap:
@@ -88,12 +82,14 @@ outputs:
             detach: false
             image: *mysql_image
             net: host
+            # Kolla bootstraps aren't idempotent, explicitly checking if bootstrap was done
+            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
-              - mariadb:/var/lib/mysql/
+              - /var/lib/mysql:/var/lib/mysql
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
               - KOLLA_BOOTSTRAP=True
@@ -124,13 +120,15 @@ 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:
-            - "mariadb:/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:
+            path: /var/lib/mysql
+            state: directory
       upgrade_tasks:
         - name: Stop and disable mysql service
           tags: step2