From e4c3c390d9e93633d40faab9ffa0001fc62435b6 Mon Sep 17 00:00:00 2001
From: Joshua Hesketh <josh@nitrotech.org>
Date: Mon, 13 Jul 2015 23:48:43 +1000
Subject: [PATCH] Disable migrate-flavor-data

The testing datasets are being updated to include this. This would
still be useful to test in the future if we fix kilo

Change-Id: I9d8849ce7b58eb5e2fd61c91ce691b58d27f3745
---
 .../real_db_upgrade/nova_mysql_migrations.sh       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 cbbd254..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
@@ -210,13 +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
-    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
+    # 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