Merge "mysql: sync credentials in running container on password change"

docker/services/database/mysql.yaml

@@ -199,6 +199,16 @@ outputs:
             volumes: *mysql_volumes
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+        step_3:
+          # sync credentials config on the running container if it was
+          # changed by the docker_puppet_task during step 2
+          mysql_sync_credentials:
+            config_volume: mysql
+            start_order: 1
+            action: exec
+            user: root
+            command:
+              [ 'mysql', '/bin/bash', '-c', 'cp /var/lib/kolla/config_files/src/root/.my.cnf /root' ]
       docker_puppet_tasks:
         # MySQL database initialization occurs only on single node
         step_2:
@@ -211,7 +221,7 @@ outputs:
             -
               - /var/lib/mysql:/var/lib/mysql/:rw
               - /var/log/containers/mysql:/var/log/mariadb
-              - /var/lib/config-data/mysql/root:/root:rw #provides .my.cnf for puppet, changed on password update
+              - /var/lib/config-data/puppet-generated/mysql/root:/root:rw #provides .my.cnf for puppet, changed on password update
             - if:
               - internal_tls_enabled
               -