Merge "[train] mysql: adjust CLI args based on container cli" into stable/train

deployment/database/mysql-pacemaker-puppet.yaml

@@ -580,15 +580,19 @@ outputs:
               shell:
                 str_replace:
                   template:
-                    'CONTAINER_CLI run --rm --log-driver=k8s-file --log-opt path=LOG_DIR/db-upgrade.log \
+                    'CONTAINER_CLI run --rm CONTAINER_CLI_EXTRA_ARGS \
                     -u root --net=host UPGRADE_ENV UPGRADE_VOLUMES "UPGRADE_IMAGE" /bin/bash -ecx "UPGRADE_SCRIPT"'
                   params:
+                    CONTAINER_CLI_EXTRA_ARGS:
+                      if:
+                      - docker_enabled
+                      - '--log-driver=syslog'
+                      - '--log-driver=k8s-file --log-opt path=/var/log/containers/mysql/db-upgrade.log'
                     UPGRADE_ENV: '-e "KOLLA_CONFIG_STRATEGY=COPY_ALWAYS"'
                     UPGRADE_IMAGE: *mysql_image_pcmklatest
                     UPGRADE_VOLUMES: "-v {{ mysql_upgrade_db_bind_mounts | union(['/tmp/mariadb-upgrade:/var/log/mariadb:rw,z']) | join(' -v ')}}"
                     UPGRADE_SCRIPT: "{{mysql_upgrade_script}}"
                     CONTAINER_CLI: "{{ container_cli }}"
-                    LOG_DIR: '/var/log/containers/mysql'
 
       external_upgrade_tasks:
         # https://bugs.launchpad.net/tripleo/+bug/1753247