diff --git a/files/apts/trema b/files/apts/trema index e33ccd3004..09cb7c6794 100644 --- a/files/apts/trema +++ b/files/apts/trema @@ -6,6 +6,7 @@ rubygems1.8 ruby1.8-dev libpcap-dev libsqlite3-dev +libglib2.0-dev # Sliceable Switch sqlite3 diff --git a/lib/neutron_plugins/nec b/lib/neutron_plugins/nec index 3806c32c75..d8d8b7ce7e 100644 --- a/lib/neutron_plugins/nec +++ b/lib/neutron_plugins/nec @@ -55,21 +55,26 @@ function neutron_plugin_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 return fi # Set up integration 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 - 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-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 sudo ovs-vsctl --no-wait -- --may-exist add-port $OVS_BRIDGE $OVS_INTERFACE fi _neutron_setup_ovs_tunnels $OVS_BRIDGE +} + +function neutron_plugin_configure_plugin_agent() { + _quantum_plugin_setup_bridge + AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-nec-agent" _neutron_ovs_base_configure_firewall_driver diff --git a/lib/neutron_thirdparty/trema b/lib/neutron_thirdparty/trema index 5b5c4590c3..9efd3f6c39 100644 --- a/lib/neutron_thirdparty/trema +++ b/lib/neutron_thirdparty/trema @@ -28,7 +28,7 @@ TREMA_TMP_DIR=$TREMA_DATA_DIR/trema TREMA_LOG_LEVEL=${TREMA_LOG_LEVEL:-info} 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 function configure_trema() {