In preparation for supporting 2 node devstack jobs, where the first node
is an all in one and the second is a compute node. Make nova config
options allow_resize_to_same_host and allow_migrate_to_same_host
configurable so we can turn them off when we have two compute nodes.
Change-Id: If6989200b56c4597d6e8506d0dda2cc75d0881f1
... | ... |
@@ -137,6 +137,10 @@ FLAT_INTERFACE=${FLAT_INTERFACE:-$GUEST_INTERFACE_DEFAULT} |
137 | 137 |
# running the VM - removing a SPOF and bandwidth bottleneck. |
138 | 138 |
MULTI_HOST=`trueorfalse False $MULTI_HOST` |
139 | 139 |
|
140 |
+# ``NOVA_ALLOW_MOVE_TO_SAME_HOST` can be set to False in multi node devstack, |
|
141 |
+# where there are at least two nova-computes. |
|
142 |
+NOVA_ALLOW_MOVE_TO_SAME_HOST=`trueorfalse True $NOVA_ALLOW_MOVE_TO_SAME_HOST` |
|
143 |
+ |
|
140 | 144 |
# Test floating pool and range are used for testing. They are defined |
141 | 145 |
# here until the admin APIs can replace nova-manage |
142 | 146 |
TEST_FLOATING_POOL=${TEST_FLOATING_POOL:-test} |
... | ... |
@@ -411,8 +415,10 @@ function create_nova_conf { |
411 | 411 |
rm -f $NOVA_CONF |
412 | 412 |
iniset $NOVA_CONF DEFAULT verbose "True" |
413 | 413 |
iniset $NOVA_CONF DEFAULT debug "$ENABLE_DEBUG_LOG_LEVEL" |
414 |
- iniset $NOVA_CONF DEFAULT allow_resize_to_same_host "True" |
|
415 |
- iniset $NOVA_CONF DEFAULT allow_migrate_to_same_host "True" |
|
414 |
+ if [ "$NOVA_ALLOW_MOVE_TO_SAME_HOST" == "True" ]; then |
|
415 |
+ iniset $NOVA_CONF DEFAULT allow_resize_to_same_host "True" |
|
416 |
+ iniset $NOVA_CONF DEFAULT allow_migrate_to_same_host "True" |
|
417 |
+ fi |
|
416 | 418 |
iniset $NOVA_CONF DEFAULT api_paste_config "$NOVA_API_PASTE_INI" |
417 | 419 |
iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf" |
418 | 420 |
iniset $NOVA_CONF DEFAULT scheduler_driver "$SCHEDULER" |