@@ -102,10 +102,20 @@ function _configure_neutron_l3_agent {

     neutron_plugin_configure_l3_agent $Q_L3_CONF_FILE

-    _move_neutron_addresses_route "$PUBLIC_INTERFACE" "$OVS_PHYSICAL_BRIDGE" True False "inet"

-

-    if [[ $(ip -f inet6 a s dev "$PUBLIC_INTERFACE" | grep -c 'global') != 0 ]]; then

-        _move_neutron_addresses_route "$PUBLIC_INTERFACE" "$OVS_PHYSICAL_BRIDGE" False False "inet6"

+    # If we've given a PUBLIC_INTERFACE to take over, then we assume

+    # that we can own the whole thing, and privot it into the OVS

+    # bridge. If we are not, we're probably on a single interface

+    # machine, and we just setup NAT so that fixed guests can get out.

+    if [[ -n "$PUBLIC_INTERFACE" ]]; then

+        _move_neutron_addresses_route "$PUBLIC_INTERFACE" "$OVS_PHYSICAL_BRIDGE" True False "inet"

+

+        if [[ $(ip -f inet6 a s dev "$PUBLIC_INTERFACE" | grep -c 'global') != 0 ]]; then

+            _move_neutron_addresses_route "$PUBLIC_INTERFACE" "$OVS_PHYSICAL_BRIDGE" False False "inet6"

+        fi

+    else

+        local default_dev=""

+        default_dev=$(ip route | grep ^default | awk '{print $5}')

+        sudo iptables -t nat -A POSTROUTING -o $default_dev -s $FLOATING_RANGE -j MASQUERADE

     fi

 }

@@ -128,7 +128,7 @@ fi

 # --------------------------

 NETWORK_MANAGER=${NETWORK_MANAGER:-${NET_MAN:-FlatDHCPManager}}

-PUBLIC_INTERFACE=${PUBLIC_INTERFACE:-$PUBLIC_INTERFACE_DEFAULT}

+

 VLAN_INTERFACE=${VLAN_INTERFACE:-$GUEST_INTERFACE_DEFAULT}

 FLAT_NETWORK_BRIDGE=${FLAT_NETWORK_BRIDGE:-$FLAT_NETWORK_BRIDGE_DEFAULT}

@@ -659,8 +659,9 @@ function create_nova_cache_dir {

 }

 function create_nova_conf_nova_network {

+    local public_interface=${PUBLIC_INTERFACE:-$PUBLIC_INTERFACE_DEFAULT}

     iniset $NOVA_CONF DEFAULT network_manager "nova.network.manager.$NETWORK_MANAGER"

-    iniset $NOVA_CONF DEFAULT public_interface "$PUBLIC_INTERFACE"

+    iniset $NOVA_CONF DEFAULT public_interface "$public_interface"

     iniset $NOVA_CONF DEFAULT vlan_interface "$VLAN_INTERFACE"

     iniset $NOVA_CONF DEFAULT flat_network_bridge "$FLAT_NETWORK_BRIDGE"

     if [ -n "$FLAT_INTERFACE" ]; then

@@ -70,11 +70,13 @@ if ! isset ENABLED_SERVICES ; then

     # Keystone - nothing works without keystone

     ENABLED_SERVICES=key

     # Nova - services to support libvirt based openstack clouds

-    ENABLED_SERVICES+=,n-api,n-cpu,n-net,n-cond,n-sch,n-novnc,n-cauth

+    ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-novnc,n-cauth

     # Glance services needed for Nova

     ENABLED_SERVICES+=,g-api,g-reg

     # Cinder

     ENABLED_SERVICES+=,c-sch,c-api,c-vol

+    # Neutron

+    ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-agt,q-l3

     # Dashboard

     ENABLED_SERVICES+=,horizon

     # Additional services

@@ -710,6 +712,8 @@ S3_SERVICE_PORT=${S3_SERVICE_PORT:-3333}

 PRIVATE_NETWORK_NAME=${PRIVATE_NETWORK_NAME:-"private"}

 PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-"public"}

+PUBLIC_INTERFACE=""

+

 # Set default screen name

 SCREEN_NAME=${SCREEN_NAME:-stack}