openstack/devstack
Code Issues Proposed changes

Move Q_ROUTER_NAME to where it belongs

Browse Source 
The motivation is to make it more friendly with lib/neutron.
ie. independent from lib/neutron-legacy

Change-Id: I19821b009cbf1bc715a6c7b2854e4c77d2041ec4
This commit is contained in:
YAMAMOTO Takashi 2016-07-21 19:37:04 +09:00
parent 4a55d2a660
commit 1aa4368135
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/neutron-legacy
View File

@ -125,8 +125,6 @@ Q_USE_ROOTWRAP_DAEMON=$(trueorfalse True Q_USE_ROOTWRAP_DAEMON)
Q_META_DATA_IP=${Q_META_DATA_IP:-$SERVICE_HOST} Q_META_DATA_IP=${Q_META_DATA_IP:-$SERVICE_HOST}
# Allow Overlapping IP among subnets # Allow Overlapping IP among subnets
Q_ALLOW_OVERLAPPING_IP=${Q_ALLOW_OVERLAPPING_IP:-True} 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_STATUS_CHANGES=${Q_NOTIFY_NOVA_PORT_STATUS_CHANGES:-True}
Q_NOTIFY_NOVA_PORT_DATA_CHANGES=${Q_NOTIFY_NOVA_PORT_DATA_CHANGES:-True} Q_NOTIFY_NOVA_PORT_DATA_CHANGES=${Q_NOTIFY_NOVA_PORT_DATA_CHANGES:-True}
VIF_PLUGGING_IS_FATAL=${VIF_PLUGGING_IS_FATAL:-True} VIF_PLUGGING_IS_FATAL=${VIF_PLUGGING_IS_FATAL:-True}

3
lib/neutron_plugins/services/l3
View File

@ -22,6 +22,9 @@ PUBLIC_BRIDGE_MTU=${PUBLIC_BRIDGE_MTU:-1500}
# used. # used.
Q_ASSIGN_GATEWAY_TO_PUBLIC_BRIDGE=${Q_ASSIGN_GATEWAY_TO_PUBLIC_BRIDGE:-True} 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 # If Q_USE_PUBLIC_VETH=True, create and use a veth pair instead of
# PUBLIC_BRIDGE. This is intended to be used with # PUBLIC_BRIDGE. This is intended to be used with
# Q_USE_PROVIDERNET_FOR_PUBLIC=True. # Q_USE_PROVIDERNET_FOR_PUBLIC=True.

1
lib/tempest
View File

@ -15,7 +15,6 @@
# - ``SERVICE_HOST`` # - ``SERVICE_HOST``
# - ``BASE_SQL_CONN`` ``lib/database`` declares # - ``BASE_SQL_CONN`` ``lib/database`` declares
# - ``PUBLIC_NETWORK_NAME`` # - ``PUBLIC_NETWORK_NAME``
# - ``Q_ROUTER_NAME``
# - ``VIRT_DRIVER`` # - ``VIRT_DRIVER``
# - ``LIBVIRT_TYPE`` # - ``LIBVIRT_TYPE``
# - ``KEYSTONE_SERVICE_PROTOCOL``, ``KEYSTONE_SERVICE_HOST`` from lib/keystone # - ``KEYSTONE_SERVICE_PROTOCOL``, ``KEYSTONE_SERVICE_HOST`` from lib/keystone