@@ -179,7 +179,7 @@ source $TOP_DIR/lib/quantum_plugins/$Q_PLUGIN

 # Agent loadbalancer service plugin functions

 # -------------------------------------------

 # Hardcoding for 1 service plugin for now

-source $TOP_DIR/lib/quantum_plugins/agent_loadbalancer

+source $TOP_DIR/lib/quantum_plugins/services/agent_loadbalancer

 # Use security group or not

 if has_quantum_plugin_security_group; then

deleted file mode 100644

@@ -1,48 +0,0 @@

-# Quantum loadbalancer plugin

-# ---------------------------

-

-# Save trace setting

-MY_XTRACE=$(set +o | grep xtrace)

-set +o xtrace

-

-

-AGENT_LBAAS_BINARY="$QUANTUM_DIR/bin/quantum-lbaas-agent"

-

-function quantum_agent_lbaas_install_agent_packages() {

-    if is_ubuntu || is_fedora; then

-        install_package haproxy

-    elif is_suse; then

-        ### FIXME: Find out if package can be pushed to Factory

-        echo "HAProxy packages can be installed from server:http project in OBS"

-    fi

-}

-

-function quantum_agent_lbaas_configure_common() {

-    if [[ $Q_SERVICE_PLUGIN_CLASSES == '' ]]; then

-        Q_SERVICE_PLUGIN_CLASSES="quantum.plugins.services.agent_loadbalancer.plugin.LoadBalancerPlugin"

-    else

-        Q_SERVICE_PLUGIN_CLASSES="$Q_SERVICE_PLUGIN_CLASSES,quantum.plugins.services.agent_loadbalancer.plugin.LoadBalancerPlugin"

-    fi

-}

-

-function quantum_agent_lbaas_configure_agent() {

-    LBAAS_AGENT_CONF_PATH=/etc/quantum/plugins/services/agent_loadbalancer

-    mkdir -p $LBAAS_AGENT_CONF_PATH

-

-    LBAAS_AGENT_CONF_FILENAME="$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini"

-

-    cp $QUANTUM_DIR/etc/lbaas_agent.ini /$LBAAS_AGENT_CONF_FILENAME

-

-    if [[ $Q_PLUGIN == 'linuxbridge' || $Q_PLUGIN == 'brocade' ]]; then

-        iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT interface_driver "quantum.agent.linux.interface.BridgeInterfaceDriver"

-    else

-        iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT interface_driver "quantum.agent.linux.interface.OVSInterfaceDriver"

-    fi

-

-    if is_fedora; then

-        iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT user_group "nobody"

-    fi

-}

-

-# Restore xtrace

-$MY_XTRACE

new file mode 100644

@@ -0,0 +1,45 @@

+# Quantum loadbalancer plugin

+# ---------------------------

+

+# Save trace setting

+MY_XTRACE=$(set +o | grep xtrace)

+set +o xtrace

+

+

+AGENT_LBAAS_BINARY="$QUANTUM_DIR/bin/quantum-lbaas-agent"

+AGENT_LBAAS_PLUGIN=quantum.plugins.services.agent_loadbalancer.plugin.LoadBalancerPlugin

+

+function quantum_agent_lbaas_install_agent_packages() {

+    if is_ubuntu || is_fedora; then

+        install_package haproxy

+    elif is_suse; then

+        ### FIXME: Find out if package can be pushed to Factory

+        echo "HAProxy packages can be installed from server:http project in OBS"

+    fi

+}

+

+function quantum_agent_lbaas_configure_common() {

+    if [[ $Q_SERVICE_PLUGIN_CLASSES == '' ]]; then

+        Q_SERVICE_PLUGIN_CLASSES=$AGENT_LBAAS_PLUGIN

+    else

+        Q_SERVICE_PLUGIN_CLASSES="$Q_SERVICE_PLUGIN_CLASSES,$AGENT_LBAAS_PLUGIN"

+    fi

+}

+

+function quantum_agent_lbaas_configure_agent() {

+    LBAAS_AGENT_CONF_PATH=/etc/quantum/plugins/services/agent_loadbalancer

+    mkdir -p $LBAAS_AGENT_CONF_PATH

+

+    LBAAS_AGENT_CONF_FILENAME="$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini"

+

+    cp $QUANTUM_DIR/etc/lbaas_agent.ini $LBAAS_AGENT_CONF_FILENAME

+

+    quantum_plugin_setup_interface_driver $LBAAS_AGENT_CONF_FILENAME

+

+    if is_fedora; then

+        iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT user_group "nobody"

+    fi

+}

+

+# Restore xtrace

+$MY_XTRACE