diff options
Diffstat (limited to 'turbo_hipster')
| -rwxr-xr-x | turbo_hipster/task_plugins/real_db_upgrade/nova_mysql_migrations.sh | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/turbo_hipster/task_plugins/real_db_upgrade/nova_mysql_migrations.sh b/turbo_hipster/task_plugins/real_db_upgrade/nova_mysql_migrations.sh index 2a15bda..62d9e53 100755 --- a/turbo_hipster/task_plugins/real_db_upgrade/nova_mysql_migrations.sh +++ b/turbo_hipster/task_plugins/real_db_upgrade/nova_mysql_migrations.sh @@ -115,20 +115,6 @@ EOF for i in `seq $start_version $increment $end_version` do - # TODO(jhesketh): This is a bit of a hack until we update our datasets to - # have the flavour data migrated. We know 291 does the migration check - # so we'll migrate just before then - if [ $i == 291 ] - then - set -x - echo "MySQL counters before migrate_flavor_data:" - mysql -u $DB_USER --password=$DB_PASS $DB_NAME -e "show status like 'innodb%';" - sudo /sbin/ip netns exec nonet `dirname $0`/nova-manage-wrapper.sh $VENV_PATH --config-file $WORKING_DIR_PATH/nova-$1.conf --verbose db migrate_flavor_data --force - echo "MySQL counters after migrate_flavor_data:" - mysql -u $DB_USER --password=$DB_PASS $DB_NAME -e "show status like 'innodb%';" - set +x - fi - set -x sudo /sbin/ip netns exec nonet `dirname $0`/nova-manage-wrapper.sh $VENV_PATH --config-file $WORKING_DIR_PATH/nova-$1.conf --verbose db sync --version $i manage_exit=$? @@ -186,10 +172,11 @@ stable_release_db_sync() { if [ $version -lt "234" ] then echo "Database is from Havana! Upgrade via Icehouse" - git branch -D stable/icehouse || true + git branch -D eol/icehouse || true git remote update - git checkout -b stable/icehouse - git reset --hard remotes/origin/stable/icehouse + git checkout -b eol/icehouse + # Use tag + git reset --hard icehouse-eol pip_requires db_sync "icehouse" fi @@ -220,6 +207,16 @@ stable_release_db_sync() { git reset --hard remotes/origin/stable/kilo pip_requires db_sync "kilo" + + # TODO(jhesketh): This is a bit of a hack until we update our datasets to + # have the flavour data migrated. We have to do this before upgrading from + # set -x + # echo "MySQL counters before migrate_flavor_data:" + # mysql -u $DB_USER --password=$DB_PASS $DB_NAME -e "show status like 'innodb%';" + # sudo /sbin/ip netns exec nonet `dirname $0`/nova-manage-wrapper.sh $VENV_PATH --config-file $WORKING_DIR_PATH/nova-kilo.conf --verbose db migrate_flavor_data --force + # echo "MySQL counters after migrate_flavor_data:" + # mysql -u $DB_USER --password=$DB_PASS $DB_NAME -e "show status like 'innodb%';" + # set +x fi # TODO(jhesketh): Add in Liberty here once released |