@@ -125,8 +125,6 @@ Q_USE_ROOTWRAP_DAEMON=$(trueorfalse True Q_USE_ROOTWRAP_DAEMON)

 Q_META_DATA_IP=${Q_META_DATA_IP:-$SERVICE_HOST}

 # Allow Overlapping IP among subnets

 Q_ALLOW_OVERLAPPING_IP=${Q_ALLOW_OVERLAPPING_IP:-True}

-# The name of the default q-l3 router

-Q_ROUTER_NAME=${Q_ROUTER_NAME:-router1}

 Q_NOTIFY_NOVA_PORT_STATUS_CHANGES=${Q_NOTIFY_NOVA_PORT_STATUS_CHANGES:-True}

 Q_NOTIFY_NOVA_PORT_DATA_CHANGES=${Q_NOTIFY_NOVA_PORT_DATA_CHANGES:-True}

 VIF_PLUGGING_IS_FATAL=${VIF_PLUGGING_IS_FATAL:-True}

@@ -22,6 +22,9 @@ PUBLIC_BRIDGE_MTU=${PUBLIC_BRIDGE_MTU:-1500}

 # used.

 Q_ASSIGN_GATEWAY_TO_PUBLIC_BRIDGE=${Q_ASSIGN_GATEWAY_TO_PUBLIC_BRIDGE:-True}

+# The name of the default router

+Q_ROUTER_NAME=${Q_ROUTER_NAME:-router1}

+

 # If Q_USE_PUBLIC_VETH=True, create and use a veth pair instead of

 # PUBLIC_BRIDGE.  This is intended to be used with

 # Q_USE_PROVIDERNET_FOR_PUBLIC=True.

@@ -15,7 +15,6 @@

 #   - ``SERVICE_HOST``

 #   - ``BASE_SQL_CONN`` ``lib/database`` declares

 #   - ``PUBLIC_NETWORK_NAME``

-#   - ``Q_ROUTER_NAME``

 #   - ``VIRT_DRIVER``

 #   - ``LIBVIRT_TYPE``

 #   - ``KEYSTONE_SERVICE_PROTOCOL``, ``KEYSTONE_SERVICE_HOST`` from lib/keystone