openstack/devstack
Code Issues Proposed changes

Devstack support for Quantum DHCP

Browse Source 
Fixes bug 1019462.

A new screen q-dhcp is created for the agent output.

Change-Id: Ie7f21a5f76ea7988ce817568edac7222cf7063d1
This commit is contained in:
Gary Kotton 2012-07-16 18:02:37 -04:00
parent 282fbda6f4
commit bff593d928
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -14,6 +14,7 @@ Eddie Hebert <edhebert@gmail.com>
Eoghan Glynn <eglynn@redhat.com> Eoghan Glynn <eglynn@redhat.com>
Eric Windisch <ewindisch@cloudscaling.com> Eric Windisch <ewindisch@cloudscaling.com>
Gabriel Hurley <gabriel@strikeawe.com> Gabriel Hurley <gabriel@strikeawe.com>
Gary Kotton <gkotton@redhat.com>
Hengqing Hu <hudayou@hotmail.com> Hengqing Hu <hudayou@hotmail.com>
Hua ZHANG <zhuadl@cn.ibm.com> Hua ZHANG <zhuadl@cn.ibm.com>
Jake Dahn <admin@jakedahn.com> Jake Dahn <admin@jakedahn.com>

31
stack.sh
View File

@ -1145,6 +1145,37 @@ if is_service_enabled q-agt; then
screen_it q-agt "sudo python $AGENT_BINARY /$Q_PLUGIN_CONF_FILE -v" screen_it q-agt "sudo python $AGENT_BINARY /$Q_PLUGIN_CONF_FILE -v"
fi fi
# Quantum DHCP
if is_service_enabled q-dhcp; then
AGENT_DHCP_BINARY="$QUANTUM_DIR/bin/quantum-dhcp-agent"
Q_DHCP_CONF_FILE=/etc/quantum/dhcp_agent.ini
if [[ -e $QUANTUM_DIR/etc/dhcp_agent.ini ]]; then
sudo cp $QUANTUM_DIR/etc/dhcp_agent.ini $Q_DHCP_CONF_FILE
fi
# Set verbose
iniset $Q_DHCP_CONF_FILE DEFAULT verbose True
# Set debug
iniset $Q_DHCP_CONF_FILE DEFAULT debug True
# Update database
iniset $Q_DHCP_CONF_FILE DEFAULT db_connection "mysql:\/\/$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST\/$Q_DB_NAME?charset=utf8"
iniset $Q_DHCP_CONF_FILE DEFAULT auth_url "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_AUTH_HOST:$KEYSTONE_AUTH_PORT/v2.0"
iniset $Q_DHCP_CONF_FILE DEFAULT admin_tenant_name $SERVICE_TENANT_NAME
iniset $Q_DHCP_CONF_FILE DEFAULT admin_user $Q_ADMIN_USERNAME
iniset $Q_DHCP_CONF_FILE DEFAULT admin_password $SERVICE_PASSWORD
if [[ "$Q_PLUGIN" = "openvswitch" ]]; then
iniset $Q_DHCP_CONF_FILE DEFAULT interface_driver quantum.agent.linux.interface.OVSInterfaceDriver
elif [[ "$Q_PLUGIN" = "linuxbridge" ]]; then
iniset $Q_DHCP_CONF_FILE DEFAULT interface_driver quantum.agent.linux.interface.BridgeInterfaceDriver
fi
# Start up the quantum agent
screen_it q-dhcp "sudo python $AGENT_DHCP_BINARY --config-file=$Q_DHCP_CONF_FILE"
fi
# Melange service # Melange service
if is_service_enabled m-svc; then if is_service_enabled m-svc; then
if is_service_enabled mysql; then if is_service_enabled mysql; then