From f35c3455097a91cf6e07456b339829d82c18ad65 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 5 Oct 2020 14:59:11 -0400 Subject: [PATCH] [train] mysql: adjust CLI args based on container cli k8s-file log driver only exists for podman, such as log-opt path option. For docker, we'll use syslogd log driver. Note: this patch is only done for train and stein, where we still support Docker. Change-Id: Ie47e1cd81b25914d28ac63668817ce6237e2e8a9 Closes-Bug: #1898610 --- deployment/database/mysql-pacemaker-puppet.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index af59ef0245..97a7e2c972 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/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