1. devstack
  2. Commit b7196174ddc0205c6b15325b957df2f393ca4861
Browse code

Change path to loadbalancer plugin

LoadbalancerPlugin path needs to be changed to reflect renaming
agent_loadbalancer to loadbalancer and moving services directory
one level up.

Change-Id: Ib2ece411b5fb84575673a66421eb474888dd8f43

Eugene Nikanorov authored on 2013/06/14 03:11:42
Showing 3 changed files
lib/quantum
History View file @ b719617
... ... 
@@ -187,7 +187,7 @@ source $TOP_DIR/lib/quantum_plugins/$Q_PLUGIN
187 187 
 # -------------------------------------------
188 188
189 189 
 # Hardcoding for 1 service plugin for now
190 
-source $TOP_DIR/lib/quantum_plugins/services/agent_loadbalancer
190 
+source $TOP_DIR/lib/quantum_plugins/services/loadbalancer
191 191
192 192 
 # Use security group or not
193 193 
 if has_quantum_plugin_security_group; then
lib/quantum_plugins/services/agent_loadbalancer
History View file @ b719617
194 194 
deleted file mode 100644
... ... 
@@ -1,50 +0,0 @@
1 
-# Quantum loadbalancer plugin
2 
-# ---------------------------
3 
-
4 
-# Save trace setting
5 
-MY_XTRACE=$(set +o | grep xtrace)
6 
-set +o xtrace
7 
-
8 
-
9 
-AGENT_LBAAS_BINARY="$QUANTUM_DIR/bin/quantum-lbaas-agent"
10 
-AGENT_LBAAS_PLUGIN=quantum.plugins.services.agent_loadbalancer.plugin.LoadBalancerPlugin
11 
-
12 
-function quantum_agent_lbaas_install_agent_packages() {
13 
-    if is_ubuntu || is_fedora; then
14 
-        install_package haproxy
15 
-    elif is_suse; then
16 
-        ### FIXME: Find out if package can be pushed to Factory
17 
-        echo "HAProxy packages can be installed from server:http project in OBS"
18 
-    fi
19 
-}
20 
-
21 
-function quantum_agent_lbaas_configure_common() {
22 
-    if [[ $Q_SERVICE_PLUGIN_CLASSES == '' ]]; then
23 
-        Q_SERVICE_PLUGIN_CLASSES=$AGENT_LBAAS_PLUGIN
24 
-    else
25 
-        Q_SERVICE_PLUGIN_CLASSES="$Q_SERVICE_PLUGIN_CLASSES,$AGENT_LBAAS_PLUGIN"
26 
-    fi
27 
-}
28 
-
29 
-function quantum_agent_lbaas_configure_agent() {
30 
-    LBAAS_AGENT_CONF_PATH=/etc/quantum/plugins/services/agent_loadbalancer
31 
-    mkdir -p $LBAAS_AGENT_CONF_PATH
32 
-
33 
-    LBAAS_AGENT_CONF_FILENAME="$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini"
34 
-
35 
-    cp $QUANTUM_DIR/etc/lbaas_agent.ini $LBAAS_AGENT_CONF_FILENAME
36 
-
37 
-    iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT use_namespaces $Q_USE_NAMESPACE
38 
-    # ovs_use_veth needs to be set before the plugin configuration
39 
-    # occurs to allow plugins to override the setting.
40 
-    iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT ovs_use_veth $Q_OVS_USE_VETH
41 
-
42 
-    quantum_plugin_setup_interface_driver $LBAAS_AGENT_CONF_FILENAME
43 
-
44 
-    if is_fedora; then
45 
-        iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT user_group "nobody"
46 
-    fi
47 
-}
48 
-
49 
-# Restore xtrace
50 
-$MY_XTRACE
lib/quantum_plugins/services/loadbalancer
History View file @ b719617
51 1 
new file mode 100644
... ... 
@@ -0,0 +1,50 @@
0 
+# Quantum loadbalancer plugin
1 
+# ---------------------------
2 
+
3 
+# Save trace setting
4 
+MY_XTRACE=$(set +o | grep xtrace)
5 
+set +o xtrace
6 
+
7 
+
8 
+AGENT_LBAAS_BINARY="$QUANTUM_DIR/bin/quantum-lbaas-agent"
9 
+LBAAS_PLUGIN=quantum.services.loadbalancer.plugin.LoadBalancerPlugin
10 
+
11 
+function quantum_agent_lbaas_install_agent_packages() {
12 
+    if is_ubuntu || is_fedora; then
13 
+        install_package haproxy
14 
+    elif is_suse; then
15 
+        ### FIXME: Find out if package can be pushed to Factory
16 
+        echo "HAProxy packages can be installed from server:http project in OBS"
17 
+    fi
18 
+}
19 
+
20 
+function quantum_agent_lbaas_configure_common() {
21 
+    if [[ $Q_SERVICE_PLUGIN_CLASSES == '' ]]; then
22 
+        Q_SERVICE_PLUGIN_CLASSES=$LBAAS_PLUGIN
23 
+    else
24 
+        Q_SERVICE_PLUGIN_CLASSES="$Q_SERVICE_PLUGIN_CLASSES,$LBAAS_PLUGIN"
25 
+    fi
26 
+}
27 
+
28 
+function quantum_agent_lbaas_configure_agent() {
29 
+    LBAAS_AGENT_CONF_PATH=/etc/quantum/services/loadbalancer/haproxy
30 
+    mkdir -p $LBAAS_AGENT_CONF_PATH
31 
+
32 
+    LBAAS_AGENT_CONF_FILENAME="$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini"
33 
+
34 
+    cp $QUANTUM_DIR/etc/lbaas_agent.ini $LBAAS_AGENT_CONF_FILENAME
35 
+
36 
+    iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT use_namespaces $Q_USE_NAMESPACE
37 
+    # ovs_use_veth needs to be set before the plugin configuration
38 
+    # occurs to allow plugins to override the setting.
39 
+    iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT ovs_use_veth $Q_OVS_USE_VETH
40 
+
41 
+    quantum_plugin_setup_interface_driver $LBAAS_AGENT_CONF_FILENAME
42 
+
43 
+    if is_fedora; then
44 
+        iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT user_group "nobody"
45 
+    fi
46 
+}
47 
+
48 
+# Restore xtrace
49 
+$MY_XTRACE