commit 75bae7076a3d24c049f7d5e265eb5640713b042e
author Jenkins <jenkins@review.openstack.org> Mon May 11 15:43:23 2015 +0000
committer Gerrit Code Review <review@openstack.org> Mon May 11 15:43:23 2015 +0000
tree 395b5b28d6d4ee7cba93a8cc6dbeb0b79992b03e
parent e3fcc54b9ba99577d9d74d175b86974aab208514
parent b3a8f6032a47fd78fcaeb46bca6572a700c775ce

Merge "nova: remove allow_migrate_to_same_host config usage"

lib/nova

diff --git a/lib/nova b/lib/nova
index 768346a..6ac9da3 100644
--- a/lib/nova
+++ b/lib/nova
@@ -460,7 +460,6 @@
     iniset $NOVA_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL"
     if [ "$NOVA_ALLOW_MOVE_TO_SAME_HOST" == "True" ]; then
         iniset $NOVA_CONF DEFAULT allow_resize_to_same_host "True"
-        iniset $NOVA_CONF DEFAULT allow_migrate_to_same_host "True"
     fi
     iniset $NOVA_CONF DEFAULT api_paste_config "$NOVA_API_PASTE_INI"
     iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf"