openstack/tripleo-heat-templates
Code Issues Proposed changes

Moved some variable definitions to global scope

Browse Source 
As suggested by Sofer Athlan-Guyot in
https://review.openstack.org/#/c/437959/

variables that has been reported as undefined during
the execution of the major upgrade script from M to N has been moved to
global scope since are used in more places.

(this fix has proposed before to master, but these scripts has been
deleted so i'm reproposing it to stable/newton where this script
makes sense to exist)

Change-Id: I16af054e7e8db31abe9cea121387a3d744f1c31f
Closes-Bug: #1667731
This commit is contained in:
Luca Lorenzetto 2017-03-17 09:45:26 +01:00
parent b1fdd543ca
commit f1c66d4fe9
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
extraconfig/tasks/major_upgrade_check.sh
View File

@ -2,6 +2,18 @@
set -eu
# Some global variables that are used throughout the upgrade scripts
# Where to backup current database if mysql need to be upgraded
MYSQL_BACKUP_DIR=/var/tmp/mysql_upgrade_osp
MYSQL_TEMP_UPGRADE_BACKUP_DIR=/var/lib/mysql-temp-upgrade-backup
# Spare disk ratio for extra safety
MYSQL_BACKUP_SIZE_RATIO=1.2
# the /root/.my.cnf is needed because we set the mysql root
# password from liberty onwards
BACKUP_FLAGS="--defaults-extra-file=/root/.my.cnf -u root --flush-privileges --all-databases --single-transaction"
check_cluster()
{
if pcs status 2>&1 | grep -E '(cluster is not currently running)|(OFFLINE:)'; then
@ -38,12 +50,6 @@ mysql_need_update()
check_disk_for_mysql_dump()
{
# Where to backup current database if mysql need to be upgraded
MYSQL_BACKUP_DIR=/var/tmp/mysql_upgrade_osp
MYSQL_TEMP_UPGRADE_BACKUP_DIR=/var/lib/mysql-temp-upgrade-backup
# Spare disk ratio for extra safety
MYSQL_BACKUP_SIZE_RATIO=1.2
mysql_need_update
if [ "$(hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid)" = "$(facter hostname)" ]; then
@ -59,13 +65,10 @@ check_disk_for_mysql_dump()
exit 1
fi
# the /root/.my.cnf is needed because we set the mysql root
# password from liberty onwards
backup_flags="--defaults-extra-file=/root/.my.cnf -u root --flush-privileges --all-databases --single-transaction"
# While not ideal, this step allows us to calculate exactly how much space the dump
# will need. Our main goal here is avoiding any chance of corruption due to disk space
# exhaustion
backup_size=$(mysqldump $backup_flags 2>/dev/null | wc -c)
backup_size=$(mysqldump $BACKUP_FLAGS 2>/dev/null | wc -c)
database_size=$(du -cb /var/lib/mysql | tail -1 | awk '{ print $1 }')
free_space=$(df -B1 --output=avail "$MYSQL_BACKUP_DIR" | tail -1)

2
extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
View File

@ -50,7 +50,7 @@ mysql_need_update
if [[ -n $(is_bootstrap_node) ]]; then
if [ $DO_MYSQL_UPGRADE -eq 1 ]; then
mysqldump $backup_flags > "$MYSQL_BACKUP_DIR/openstack_database.sql"
mysqldump $BACKUP_FLAGS > "$MYSQL_BACKUP_DIR/openstack_database.sql"
cp -rdp /etc/my.cnf* "$MYSQL_BACKUP_DIR"
fi