Merge "Create floating ip pool when quantum is enalbed"

This commit is contained in:
Jenkins 2012-03-13 01:08:35 +00:00 committed by Gerrit Code Review
commit 379ac23114

View File

@ -1573,15 +1573,11 @@ if is_service_enabled mysql && is_service_enabled nova; then
# create a small network # create a small network
$NOVA_DIR/bin/nova-manage network create private $FIXED_RANGE 1 $FIXED_NETWORK_SIZE $NOVA_DIR/bin/nova-manage network create private $FIXED_RANGE 1 $FIXED_NETWORK_SIZE
if is_service_enabled q-svc; then # create some floating ips
echo "Not creating floating IPs (not supported by QuantumManager)" $NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE
else
# create some floating ips
$NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE
# create a second pool # create a second pool
$NOVA_DIR/bin/nova-manage floating create --ip_range=$TEST_FLOATING_RANGE --pool=$TEST_FLOATING_POOL $NOVA_DIR/bin/nova-manage floating create --ip_range=$TEST_FLOATING_RANGE --pool=$TEST_FLOATING_POOL
fi
fi fi