Nova's flavor migration should be run within-kilo not from-kilo

We actually need to run migrate_flavor_data on kilo code, before we upgrade to
the new code. We want to remove that compatibility code, and this started to
fail when we tried. So, this patch makes sure that we run the within-kilo step
(as provided for in the plugin docs) and do the migrate_flavor_data there.

Change-Id: I9daa648f803218bf1d8b7b7686ab73e146eeb04b

projects/60_nova/upgrade.sh

@@ -48,6 +48,9 @@ set -o xtrace
 # Save current config files for posterity
 [[ -d $SAVE_DIR/etc.nova ]] || cp -pr $NOVA_CONF_DIR $SAVE_DIR/etc.nova
 
+# calls pre-upgrade hooks for within-$base before we upgrade
+upgrade_project nova $RUN_DIR $BASE_DEVSTACK_BRANCH $BASE_DEVSTACK_BRANCH
+
 # install_nova()
 stack_install_service nova
 

projects/60_nova/within-kilo/upgrade-nova

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Kilo -> Lemming flavor migration
+# This is run on kilo code before upgrading
 function configure_nova_upgrade {
     $NOVA_BIN_DIR/nova-manage --config-file $NOVA_CONF db migrate_flavor_data || die $LINENO "Flavor migrate error"
 }