openstack/devstack
Code Issues Proposed changes

Modification for Ubuntu 13.10 and minor fixes in Neutron NEC plugin

Browse Source 
Modifications for Ubuntu 13.10:
* Add .conf suffix to apache2 config files. In Ubuntu 13.10,
  files in sites-available should have ".conf" suffix.
  Otherwise it is not recognized by a2ensite.
* libglib2.0-dev is added to lib/files/apt/trema. Trema is
  an OpenFlow controler framework used by Neutron NEC plugin
  Ubuntu package dependency seems to be changed.

Minor cleanups are also done in OVS configuration:
* Set datapath_id before connecting to the OpenFlow controller
  to ensure datapath_id changes after connected.
  Previously datapath_id is changed after connecting to the controller.
* Drop "0x" prefix from datapath_id passed to OVS.
  OVS ignores datapath_id with 0x prefix.
* Fix a bug that SKIP_OVS_BRIDGE_SETUP skips all confiugration of
  the plugin agent. It should skip only OVS setup.

Change-Id: Ifac3def8decda577b5740c82fe8d24e8520c7777
This commit is contained in:
Akihiro MOTOKI 2013-10-10 00:40:38 +09:00
parent 46b511f200
commit 7a4ae3d242
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/apts/trema
View File

@ -6,6 +6,7 @@ rubygems1.8
ruby1.8-dev ruby1.8-dev
libpcap-dev libpcap-dev
libsqlite3-dev libsqlite3-dev
libglib2.0-dev
# Sliceable Switch # Sliceable Switch
sqlite3 sqlite3

11
lib/neutron_plugins/nec
View File

@ -55,21 +55,26 @@ function neutron_plugin_configure_l3_agent() {
_neutron_ovs_base_configure_l3_agent _neutron_ovs_base_configure_l3_agent
} }
function neutron_plugin_configure_plugin_agent() { function _quantum_plugin_setup_bridge() {
if [[ "$SKIP_OVS_BRIDGE_SETUP" = "True" ]]; then if [[ "$SKIP_OVS_BRIDGE_SETUP" = "True" ]]; then
return return
fi fi
# Set up integration bridge # Set up integration bridge
_neutron_ovs_base_setup_bridge $OVS_BRIDGE _neutron_ovs_base_setup_bridge $OVS_BRIDGE
sudo ovs-vsctl --no-wait set-controller $OVS_BRIDGE tcp:$OFC_OFP_HOST:$OFC_OFP_PORT
# Generate datapath ID from HOST_IP # Generate datapath ID from HOST_IP
local dpid=$(printf "0x%07d%03d%03d%03d\n" ${HOST_IP//./ }) local dpid=$(printf "%07d%03d%03d%03d\n" ${HOST_IP//./ })
sudo ovs-vsctl --no-wait set Bridge $OVS_BRIDGE other-config:datapath-id=$dpid sudo ovs-vsctl --no-wait set Bridge $OVS_BRIDGE other-config:datapath-id=$dpid
sudo ovs-vsctl --no-wait set-fail-mode $OVS_BRIDGE secure sudo ovs-vsctl --no-wait set-fail-mode $OVS_BRIDGE secure
sudo ovs-vsctl --no-wait set-controller $OVS_BRIDGE tcp:$OFC_OFP_HOST:$OFC_OFP_PORT
if [ -n "$OVS_INTERFACE" ]; then if [ -n "$OVS_INTERFACE" ]; then
sudo ovs-vsctl --no-wait -- --may-exist add-port $OVS_BRIDGE $OVS_INTERFACE sudo ovs-vsctl --no-wait -- --may-exist add-port $OVS_BRIDGE $OVS_INTERFACE
fi fi
_neutron_setup_ovs_tunnels $OVS_BRIDGE _neutron_setup_ovs_tunnels $OVS_BRIDGE
}
function neutron_plugin_configure_plugin_agent() {
_quantum_plugin_setup_bridge
AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-nec-agent" AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-nec-agent"
_neutron_ovs_base_configure_firewall_driver _neutron_ovs_base_configure_firewall_driver

2
lib/neutron_thirdparty/trema vendored
View File

@ -28,7 +28,7 @@ TREMA_TMP_DIR=$TREMA_DATA_DIR/trema
TREMA_LOG_LEVEL=${TREMA_LOG_LEVEL:-info} TREMA_LOG_LEVEL=${TREMA_LOG_LEVEL:-info}
TREMA_SS_CONFIG=$TREMA_SS_ETC_DIR/sliceable.conf TREMA_SS_CONFIG=$TREMA_SS_ETC_DIR/sliceable.conf
TREMA_SS_APACHE_CONFIG=/etc/apache2/sites-available/sliceable_switch TREMA_SS_APACHE_CONFIG=/etc/apache2/sites-available/sliceable_switch.conf
# configure_trema - Set config files, create data dirs, etc # configure_trema - Set config files, create data dirs, etc
function configure_trema() { function configure_trema() {