Merge "Create floating ip pool when quantum is enalbed"

Jenkins · openstack-gerrit · commit 379ac23114a7 · 2012-03-13T01:08:35.000Z
diff --git a/stack.sh b/stack.sh
@@ -1573,15 +1573,11 @@ if is_service_enabled mysql && is_service_enabled nova; then
     # create a small network
     $NOVA_DIR/bin/nova-manage network create private $FIXED_RANGE 1 $FIXED_NETWORK_SIZE
 
-    if is_service_enabled q-svc; then
-        echo "Not creating floating IPs (not supported by QuantumManager)"
-    else
-        # create some floating ips
-        $NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE
+    # create some floating ips
+    $NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE
 
-        # create a second pool
-        $NOVA_DIR/bin/nova-manage floating create --ip_range=$TEST_FLOATING_RANGE --pool=$TEST_FLOATING_POOL
-    fi
+    # create a second pool
+    $NOVA_DIR/bin/nova-manage floating create --ip_range=$TEST_FLOATING_RANGE --pool=$TEST_FLOATING_POOL
 fi
 
 
