Merge "Correct mysql-pacemaker upgrade task" into stable/train
This commit is contained in:
commit
4c9b222218
|
@ -233,9 +233,9 @@ outputs:
|
|||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json
|
||||
- /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro
|
||||
- /var/lib/mysql:/var/lib/mysql
|
||||
- /var/lib/kolla/config_files/mysql.json:/var/lib/kolla/config_files/config.json:rw,z
|
||||
- /var/lib/config-data/puppet-generated/mysql/:/var/lib/kolla/config_files/src:ro,z
|
||||
- /var/lib/mysql:/var/lib/mysql:rw,z
|
||||
environment:
|
||||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||
KOLLA_BOOTSTRAP: true
|
||||
|
@ -584,13 +584,15 @@ outputs:
|
|||
shell:
|
||||
str_replace:
|
||||
template:
|
||||
'CONTAINER_CLI run --rm --log-driver=syslog -u root --net=host UPGRADE_ENV UPGRADE_VOLUMES "UPGRADE_IMAGE" /bin/bash -ecx "UPGRADE_SCRIPT"'
|
||||
'CONTAINER_CLI run --rm --log-driver=k8s-file --log-opt path=LOG_DIR/db-upgrade.log \
|
||||
-u root --net=host UPGRADE_ENV UPGRADE_VOLUMES "UPGRADE_IMAGE" /bin/bash -ecx "UPGRADE_SCRIPT"'
|
||||
params:
|
||||
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']) | join(' -v ')}}"
|
||||
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 }}"
|
||||
LOGDIR: '/var/log/containers/mysql'
|
||||
|
||||
external_upgrade_tasks:
|
||||
- vars:
|
||||
|
|
Loading…
Reference in New Issue