openstack/devstack
Code Issues Proposed changes

Merge "Change path to loadbalancer plugin"

Browse Source
This commit is contained in:
Jenkins 2013-06-18 22:06:21 +00:00 committed by Gerrit Code Review
commit 94432539ed
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/quantum
View File

@ -187,7 +187,7 @@ source $TOP_DIR/lib/quantum_plugins/$Q_PLUGIN
# ------------------------------------------- # -------------------------------------------
# Hardcoding for 1 service plugin for now # Hardcoding for 1 service plugin for now
source $TOP_DIR/lib/quantum_plugins/services/agent_loadbalancer source $TOP_DIR/lib/quantum_plugins/services/loadbalancer
# Use security group or not # Use security group or not
if has_quantum_plugin_security_group; then if has_quantum_plugin_security_group; then

8
lib/quantum_plugins/services/agent_loadbalancer → lib/quantum_plugins/services/loadbalancer
View File

@ -7,7 +7,7 @@ set +o xtrace
AGENT_LBAAS_BINARY="$QUANTUM_DIR/bin/quantum-lbaas-agent" AGENT_LBAAS_BINARY="$QUANTUM_DIR/bin/quantum-lbaas-agent"
AGENT_LBAAS_PLUGIN=quantum.plugins.services.agent_loadbalancer.plugin.LoadBalancerPlugin LBAAS_PLUGIN=quantum.services.loadbalancer.plugin.LoadBalancerPlugin
function quantum_agent_lbaas_install_agent_packages() { function quantum_agent_lbaas_install_agent_packages() {
if is_ubuntu || is_fedora; then if is_ubuntu || is_fedora; then
@ -20,14 +20,14 @@ function quantum_agent_lbaas_install_agent_packages() {
function quantum_agent_lbaas_configure_common() { function quantum_agent_lbaas_configure_common() {
if [[ $Q_SERVICE_PLUGIN_CLASSES == '' ]]; then if [[ $Q_SERVICE_PLUGIN_CLASSES == '' ]]; then
Q_SERVICE_PLUGIN_CLASSES=$AGENT_LBAAS_PLUGIN Q_SERVICE_PLUGIN_CLASSES=$LBAAS_PLUGIN
else else
Q_SERVICE_PLUGIN_CLASSES="$Q_SERVICE_PLUGIN_CLASSES,$AGENT_LBAAS_PLUGIN" Q_SERVICE_PLUGIN_CLASSES="$Q_SERVICE_PLUGIN_CLASSES,$LBAAS_PLUGIN"
fi fi
} }
function quantum_agent_lbaas_configure_agent() { function quantum_agent_lbaas_configure_agent() {
LBAAS_AGENT_CONF_PATH=/etc/quantum/plugins/services/agent_loadbalancer LBAAS_AGENT_CONF_PATH=/etc/quantum/services/loadbalancer/haproxy
mkdir -p $LBAAS_AGENT_CONF_PATH mkdir -p $LBAAS_AGENT_CONF_PATH
LBAAS_AGENT_CONF_FILENAME="$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini" LBAAS_AGENT_CONF_FILENAME="$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini"