openstack/devstack
Code Issues Proposed changes

Add variable to specify additional parameters for the Neutron service.

Browse Source 
This patch adds a new variable, Q_SRV_EXTRA_DEFAULT_OPTS, which can
override any parameter of the [DEFAULT] section of the neutron.conf
file. It can be used for example to define the number of DHCP agents
that should host a network:
  Q_SRV_EXTRA_DEFAULT_OPTS=(dhcp_agents_per_network=2)

Change-Id: Ic34164457e64dec6ca8ec76be1772f998d100991
This commit is contained in:
Simon Pasquier 2013-07-09 16:59:12 +02:00
parent e49b081b6c
commit ca96b0a169
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -122,13 +122,14 @@ In order to enable Neutron a single node setup, you'll need the following settin
Then run `stack.sh` as normal. Then run `stack.sh` as normal.
devstack supports adding specific Neutron configuration flags to both the Open vSwitch and LinuxBridge plugin configuration files. To make use of this feature, the following variables are defined and can be configured in your `localrc` file: devstack supports adding specific Neutron configuration flags to the service, Open vSwitch plugin and LinuxBridge plugin configuration files. To make use of this feature, the following variables are defined and can be configured in your `localrc` file:
Variable Name Plugin Config File Section Modified Variable Name Config File Section Modified
------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------
Q_SRV_EXTRA_OPTS `OVS` (for Open Vswitch) or `LINUX_BRIDGE` (for LinuxBridge) Q_SRV_EXTRA_OPTS Plugin `OVS` (for Open Vswitch) or `LINUX_BRIDGE` (for LinuxBridge)
Q_AGENT_EXTRA_AGENT_OPTS AGENT Q_AGENT_EXTRA_AGENT_OPTS Plugin AGENT
Q_AGENT_EXTRA_SRV_OPTS `OVS` (for Open Vswitch) or `LINUX_BRIDGE` (for LinuxBridge) Q_AGENT_EXTRA_SRV_OPTS Plugin `OVS` (for Open Vswitch) or `LINUX_BRIDGE` (for LinuxBridge)
Q_SRV_EXTRA_DEFAULT_OPTS Service DEFAULT
An example of using the variables in your `localrc` is below: An example of using the variables in your `localrc` is below:

8
lib/neutron
View File

@ -614,6 +614,14 @@ function _configure_neutron_service() {
iniset $NEUTRON_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY iniset $NEUTRON_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY
_neutron_setup_keystone $NEUTRON_CONF keystone_authtoken _neutron_setup_keystone $NEUTRON_CONF keystone_authtoken
# Define extra "DEFAULT" configuration options when q-svc is configured by
# defining the array ``Q_SRV_EXTRA_DEFAULT_OPTS``.
# For Example: ``Q_SRV_EXTRA_DEFAULT_OPTS=(foo=true bar=2)``
for I in "${Q_SRV_EXTRA_DEFAULT_OPTS[@]}"; do
# Replace the first '=' with ' ' for iniset syntax
iniset $NEUTRON_CONF DEFAULT ${I/=/ }
done
# Configure plugin # Configure plugin
neutron_plugin_configure_service neutron_plugin_configure_service
} }