Browse code

Merge "Create floating ip pool when quantum is enalbed"

Jenkins authored on 2012/03/13 10:08:35
Showing 1 changed files
... ...
@@ -1573,15 +1573,11 @@ if is_service_enabled mysql && is_service_enabled nova; then
1573 1573
     # create a small network
1574 1574
     $NOVA_DIR/bin/nova-manage network create private $FIXED_RANGE 1 $FIXED_NETWORK_SIZE
1575 1575
 
1576
-    if is_service_enabled q-svc; then
1577
-        echo "Not creating floating IPs (not supported by QuantumManager)"
1578
-    else
1579
-        # create some floating ips
1580
-        $NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE
1576
+    # create some floating ips
1577
+    $NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE
1581 1578
 
1582
-        # create a second pool
1583
-        $NOVA_DIR/bin/nova-manage floating create --ip_range=$TEST_FLOATING_RANGE --pool=$TEST_FLOATING_POOL
1584
-    fi
1579
+    # create a second pool
1580
+    $NOVA_DIR/bin/nova-manage floating create --ip_range=$TEST_FLOATING_RANGE --pool=$TEST_FLOATING_POOL
1585 1581
 fi
1586 1582
 
1587 1583