@@ -44,7 +44,7 @@ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ami}

 DEFAULT_INSTANCE_TYPE=${DEFAULT_INSTANCE_TYPE:-m1.tiny}

 # Default floating IP pool name

-DEFAULT_FLOATING_POOL=${DEFAULT_FLOATING_POOL:-nova}

+DEFAULT_FLOATING_POOL=${DEFAULT_FLOATING_POOL:-$PUBLIC_NETWORK_NAME}

 # Default user

 DEFAULT_INSTANCE_USER=${DEFAULT_INSTANCE_USER:-cirros}

@@ -44,7 +44,7 @@ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ami}

 SECGROUP=${SECGROUP:-test_secgroup}

 # Default floating IP pool name

-DEFAULT_FLOATING_POOL=${DEFAULT_FLOATING_POOL:-nova}

+DEFAULT_FLOATING_POOL=${DEFAULT_FLOATING_POOL:-$PUBLIC_NETWORK_NAME}

 # Additional floating IP pool and range

 TEST_FLOATING_POOL=${TEST_FLOATING_POOL:-test}

@@ -118,7 +118,7 @@ if ! timeout $ACTIVE_TIMEOUT sh -c "while ! nova show $VM_UUID | grep status | g

 fi

 # get the IP of the server

-IP=`nova show $VM_UUID | grep "private network" | get_field 2`

+IP=`nova show $VM_UUID | grep "$PRIVATE_NETWORK_NAME" | get_field 2`

 die_if_not_set IP "Failure retrieving IP address"

 # for single node deployments, we can ping private ips

@@ -119,7 +119,7 @@ if ! timeout $ACTIVE_TIMEOUT sh -c "while ! nova show $VM_UUID | grep status | g

 fi

 # get the IP of the server

-IP=`nova show $VM_UUID | grep "private network" | get_field 2`

+IP=`nova show $VM_UUID | grep "$PRIVATE_NETWORK_NAME" | get_field 2`

 die_if_not_set IP "Failure retrieving IP address"

 # for single node deployments, we can ping private ips

@@ -286,6 +286,7 @@ function init_nova() {

     add_nova_opt "dhcpbridge_flagfile=$NOVA_CONF"

     add_nova_opt "force_dhcp_release=True"

     add_nova_opt "fixed_range=$FIXED_RANGE"

+    add_nova_opt "default_floating_pool=$PUBLIC_NETWORK_NAME"

     add_nova_opt "s3_host=$SERVICE_HOST"

     add_nova_opt "s3_port=$S3_SERVICE_PORT"

     add_nova_opt "osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions"

@@ -1890,14 +1890,14 @@ if is_service_enabled q-svc; then

     # Create a small network

     # Since quantum command is executed in admin context at this point,

     # ``--tenant_id`` needs to be specified.

-    NET_ID=$(quantum net-create --tenant_id $TENANT_ID net1 | grep ' id ' | get_field 2)

+    NET_ID=$(quantum net-create --tenant_id $TENANT_ID "$PRIVATE_NETWORK_NAME" | grep ' id ' | get_field 2)

     SUBNET_ID=$(quantum subnet-create --tenant_id $TENANT_ID --ip_version 4 --gateway $NETWORK_GATEWAY $NET_ID $FIXED_RANGE | grep ' id ' | get_field 2)

     if is_service_enabled q-l3; then

         # Create a router, and add the private subnet as one of its interfaces

         ROUTER_ID=$(quantum router-create --tenant_id $TENANT_ID router1 | grep ' id ' | get_field 2)

         quantum router-interface-add $ROUTER_ID $SUBNET_ID

         # Create an external network, and a subnet. Configure the external network as router gw

-        EXT_NET_ID=$(quantum net-create ext_net -- --router:external=True | grep ' id ' | get_field 2)

+        EXT_NET_ID=$(quantum net-create "$PUBLIC_NETWORK_NAME" -- --router:external=True | grep ' id ' | get_field 2)

         EXT_GW_IP=$(quantum subnet-create --ip_version 4 $EXT_NET_ID $FLOATING_RANGE -- --enable_dhcp=False | grep 'gateway_ip' | get_field 2)

         quantum router-gateway-set $ROUTER_ID $EXT_NET_ID

         if [[ "$Q_PLUGIN" = "openvswitch" ]] && [[ "$Q_USE_NAMESPACE" = "True" ]]; then

@@ -1915,10 +1915,10 @@ if is_service_enabled q-svc; then

 elif is_service_enabled mysql && is_service_enabled n-net; then

     # Create a small network

-    $NOVA_BIN_DIR/nova-manage network create private $FIXED_RANGE 1 $FIXED_NETWORK_SIZE $NETWORK_CREATE_ARGS

+    $NOVA_BIN_DIR/nova-manage network create "$PRIVATE_NETWORK_NAME" $FIXED_RANGE 1 $FIXED_NETWORK_SIZE $NETWORK_CREATE_ARGS

     # Create some floating ips

-    $NOVA_BIN_DIR/nova-manage floating create $FLOATING_RANGE

+    $NOVA_BIN_DIR/nova-manage floating create $FLOATING_RANGE --pool=$PUBLIC_NETWORK_NAME

     # Create a second pool

     $NOVA_BIN_DIR/nova-manage floating create --ip_range=$TEST_FLOATING_RANGE --pool=$TEST_FLOATING_POOL

@@ -159,3 +159,6 @@ esac

 # 5Gb default volume backing file size

 VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-5130M}

+

+PRIVATE_NETWORK_NAME=${PRIVATE_NETWORK_NAME:-"private"}

+PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-"nova"}