From 489992a06985601342a5e51c20409af046c95b6f Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Fri, 10 Jul 2015 16:20:22 +1000 Subject: Remove migration check on flavor update Change-Id: Iefb354425fb485ac3caeac7d2644b5db32cfc933 --- .../real_db_upgrade/nova_mysql_migrations.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 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 1b12d61..cbbd254 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 @@ -210,17 +210,13 @@ stable_release_db_sync() { # 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 - # kilo - 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-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 + 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 -- cgit v1.2.1